kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13297 from spowelljr/extendWindowsTimeouts 

Increase test timeout for Docker Windows
pull/13544/head
Steven Powell 2022-02-01 14:07:53 -08:00 committed by GitHub
parent 48065d9090 76172fdae0
commit 89795d1946
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/integration/functional_test.go
View File

@ -960,8 +960,12 @@ func dashboardURL(b *bufio.Reader) (string, error) {
// validateDryRun asserts that the dry-run mode quickly exits with the right code // validateDryRun asserts that the dry-run mode quickly exits with the right code
func validateDryRun(ctx context.Context, t *testing.T, profile string) { func validateDryRun(ctx context.Context, t *testing.T, profile string) {
// dry-run mode should always be able to finish quickly (<5s) // dry-run mode should always be able to finish quickly (<5s) expect Docker Windows
mctx, cancel := context.WithTimeout(ctx, Seconds(5)) timeout := Seconds(5)
if runtime.GOOS == "windows" && DockerDriver() {
timeout = Seconds(10)
}
mctx, cancel := context.WithTimeout(ctx, timeout)
defer cancel() defer cancel()
// docs: Run `minikube start --dry-run --memory 250MB` // docs: Run `minikube start --dry-run --memory 250MB`
@ -980,7 +984,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() defer cancel()
// docs: Run `minikube start --dry-run` // docs: Run `minikube start --dry-run`
startArgs = append([]string{"start", "-p", profile, "--dry-run", "--alsologtostderr", "-v=1"}, StartArgs()...) startArgs = append([]string{"start", "-p", profile, "--dry-run", "--alsologtostderr", "-v=1"}, StartArgs()...)
@ -999,8 +1003,12 @@ func validateDryRun(ctx context.Context, t *testing.T, profile string) {
// validateInternationalLanguage asserts that the language used can be changed with environment variables // validateInternationalLanguage asserts that the language used can be changed with environment variables
func validateInternationalLanguage(ctx context.Context, t *testing.T, profile string) { func validateInternationalLanguage(ctx context.Context, t *testing.T, profile string) {
// dry-run mode should always be able to finish quickly (<5s) // dry-run mode should always be able to finish quickly (<5s) except Docker Windows
mctx, cancel := context.WithTimeout(ctx, Seconds(5)) timeout := Seconds(5)
if runtime.GOOS == "windows" && DockerDriver() {
timeout = Seconds(10)
}
mctx, cancel := context.WithTimeout(ctx, timeout)
defer cancel() defer cancel()
// Too little memory! // Too little memory!