From c61a34b38ffc361799d00d811cf6ca6dfacbb4d0 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 4 Jan 2022 16:53:13 -0800 Subject: [PATCH 1/3] increase test timeout for Docker Windows --- test/integration/functional_test.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index a268c058ff..d1ad505db4 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -946,8 +946,12 @@ func dashboardURL(b *bufio.Reader) (string, error) { // validateDryRun asserts that the dry-run mode quickly exits with the right code func validateDryRun(ctx context.Context, t *testing.T, profile string) { - // dry-run mode should always be able to finish quickly (<5s) - mctx, cancel := context.WithTimeout(ctx, Seconds(5)) + // dry-run mode should always be able to finish quickly (<5s) expect Docker Windows + timeout := Seconds(5) + if runtime.GOOS == "windows" && DockerDriver() { + timeout = Seconds(10) + } + mctx, cancel := context.WithTimeout(ctx, timeout) defer cancel() // docs: Run `minikube start --dry-run --memory 250MB` @@ -985,8 +989,12 @@ func validateDryRun(ctx context.Context, t *testing.T, profile string) { // validateInternationalLanguage asserts that the language used can be changed with environment variables func validateInternationalLanguage(ctx context.Context, t *testing.T, profile string) { - // dry-run mode should always be able to finish quickly (<5s) - mctx, cancel := context.WithTimeout(ctx, Seconds(5)) + // dry-run mode should always be able to finish quickly (<5s) except Docker Windows + timeout := Seconds(5) + if runtime.GOOS == "windows" && DockerDriver() { + timeout = Seconds(10) + } + mctx, cancel := context.WithTimeout(ctx, timeout) defer cancel() // Too little memory! From d77f182dfd5ab27e208f5935e564a92b6902d7b5 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 10 Jan 2022 15:55:20 -0800 Subject: [PATCH 2/3] increase timeout for DryRun to 20 seconds --- test/integration/functional_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index d1ad505db4..e431ed552c 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -949,7 +949,7 @@ func validateDryRun(ctx context.Context, t *testing.T, profile string) { // dry-run mode should always be able to finish quickly (<5s) expect Docker Windows timeout := Seconds(5) if runtime.GOOS == "windows" && DockerDriver() { - timeout = Seconds(10) + timeout = Seconds(20) } mctx, cancel := context.WithTimeout(ctx, timeout) defer cancel() From 76172fdae016edde7e6cc79a5675097664c04d65 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 25 Jan 2022 14:12:57 -0800 Subject: [PATCH 3/3] added timeout to second test --- test/integration/functional_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index e431ed552c..5ef3fa8dea 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -949,7 +949,7 @@ func validateDryRun(ctx context.Context, t *testing.T, profile string) { // dry-run mode should always be able to finish quickly (<5s) expect Docker Windows timeout := Seconds(5) if runtime.GOOS == "windows" && DockerDriver() { - timeout = Seconds(20) + timeout = Seconds(10) } mctx, cancel := context.WithTimeout(ctx, timeout) defer cancel() @@ -970,7 +970,7 @@ func validateDryRun(ctx context.Context, t *testing.T, profile string) { } } - dctx, cancel := context.WithTimeout(ctx, Seconds(5)) + dctx, cancel := context.WithTimeout(ctx, timeout) defer cancel() // docs: Run `minikube start --dry-run` startArgs = append([]string{"start", "-p", profile, "--dry-run", "--alsologtostderr", "-v=1"}, StartArgs()...)