envtest: 1m timeouts

Signed-off-by: Dr. Stefan Schimanski <stefan.schimanski@gmail.com>

Author: sttts

envtest/internal/controlplane/shard.go

@@ -25,15 +25,11 @@ import (
 	"strings"
 	"time"
 
-	ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
-
 	"github.com/kcp-dev/multicluster-provider/envtest/internal/addr"
 	"github.com/kcp-dev/multicluster-provider/envtest/internal/certs"
 	"github.com/kcp-dev/multicluster-provider/envtest/internal/process"
 )
 
-var log = ctrllog.Log.WithName("controlplane")
-
 const (
 	// saKeyFile is the name of the service account signing private key file.
 	saKeyFile = "sa-signer.key"
@@ -94,7 +90,7 @@ type Shard struct {
 	// StartTimeout, StopTimeout specify the time the Shard is allowed to
 	// take when starting and stoppping before an error is emitted.
 	//
-	// If not specified, these default to 1 min and 20 seconds respectively.
+	// If not specified, these default to 1 min.
 	StartTimeout time.Duration
 	StopTimeout  time.Duration
 

envtest/internal/process/process.go

@@ -121,7 +121,7 @@ func (ps *State) Init(name string) error {
 	}
 
 	if ps.StopTimeout == 0 {
-		ps.StopTimeout = 20 * time.Second
+		ps.StopTimeout = time.Minute
 	}
 	return nil
 }

envtest/server.go

@@ -45,7 +45,7 @@ It's possible to override some defaults, by setting the following environment va
 * TEST_ASSET_KCP (string): path to the kcp binary to use
 * TEST_KCP_ASSETS (string): directory containing the binaries to use (kcp). Defaults to /usr/local/kcp/bin.
 * TEST_KCP_START_TIMEOUT (string supported by time.ParseDuration): timeout for test kcp to start. Defaults to 1m.
-* TEST_KCP_STOP_TIMEOUT (string supported by time.ParseDuration): timeout for test kcp to start. Defaults to 20s.
+* TEST_KCP_STOP_TIMEOUT (string supported by time.ParseDuration): timeout for test kcp to start. Defaults to 1m.
 * TEST_ATTACH_KCP_OUTPUT (boolean): if set to true, the kcp's stdout and stderr are attached to os.Stdout and os.Stderr
 */
 const (
@@ -55,7 +55,7 @@ const (
 	envStopTimeout        = "TEST_KCP_STOP_TIMEOUT"
 
 	defaultKcpPlaneStartTimeout = time.Minute
-	defaultKcpStopTimeout       = 20 * time.Second
+	defaultKcpStopTimeout       = time.Minute
 )
 
 // internal types we expose as part of our public API.