diff --git a/test/integration/persistence_test.go b/test/integration/persistence_test.go index 8d14df7229c80201d62d1b7d8762da5fb0aa1b19..eb58a010d0232ce2fb4de44234571b8e579f1a87 100644 --- a/test/integration/persistence_test.go +++ b/test/integration/persistence_test.go @@ -31,21 +31,22 @@ func TestPersistence(t *testing.T) { if isTestNoneDriver() { t.Skip("skipping test as none driver does not support persistence") } - t.Parallel() - p := profile(t) // profile name - mk := NewMinikubeRunner(t, p) + p := profile(t) + if toParallel() { + t.Parallel() + } + + mk := NewMinikubeRunner(t, p, "--wait=false") defer mk.TearDown(t) + stdout, stderr, err := mk.Start() if err != nil { t.Fatalf("failed to start minikube (for profile %s) failed : %v\nstdout: %s\nstderr: %s", t.Name(), err, stdout, stderr) } - kr := util.NewKubectlRunner(t, p) - if _, err := kr.RunCommand([]string{"create", "-f", filepath.Join(*testdataDir, "busybox.yaml")}); err != nil { t.Fatalf("creating busybox pod: %s", err) } - verifyBusybox := func(t *testing.T) { if err := util.WaitForBusyboxRunning(t, "default", p); err != nil { t.Fatalf("waiting for busybox to be up: %v", err) @@ -57,12 +58,13 @@ func TestPersistence(t *testing.T) { checkStop := func() error { stdout, stderr, err = mk.RunCommandRetriable("stop") - return mk.CheckStatusNoFail(state.Stopped.String()) + return err } - if err = util.RetryX(checkStop, 15*time.Second, 3*time.Minute); err != nil { + if err = util.RetryX(checkStop, 5*time.Second, 3*time.Minute); err != nil { t.Fatalf("TestPersistence Failed to stop minikube : %v", err) } + mk.CheckStatus(state.Stopped.String()) stdout, stderr, err = mk.Start() if err != nil { diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index f05a2d5110735fee59ca8d41158f0c70261de654..8c63b99139b445eb2abd35acb228257d39686824 100644 --- a/test/integration/start_stop_delete_test.go +++ b/test/integration/start_stop_delete_test.go @@ -79,9 +79,9 @@ func TestStartStop(t *testing.T) { t.Parallel() } - pn := p + n - mk := NewMinikubeRunner(t, pn) - // TODO : redundant first clause, never happens + pn := p + n // TestStartStopoldest + mk := NewMinikubeRunner(t, pn, "--wait=false") + // TODO : redundant first clause ? never happens? if !strings.Contains(pn, "docker") && isTestNoneDriver() { t.Skipf("skipping %s - incompatible with none driver", t.Name()) } diff --git a/test/integration/util/minikube_runner.go b/test/integration/util/minikube_runner.go index 96e419d2e22ccf3798f2c5059426093550872c65..a0dde46c1a5fbfad4290ec991b741f22cfee8385 100644 --- a/test/integration/util/minikube_runner.go +++ b/test/integration/util/minikube_runner.go @@ -242,7 +242,7 @@ func (m *MinikubeRunner) Start(opts ...string) (stdout string, stderr string, er stdout, stderr, err = m.RunCommandRetriable(cmd) return err } - err = RetryX(s, 1*time.Minute, m.TimeOutStart) + err = RetryX(s, 30*time.Second, m.TimeOutStart) return stdout, stderr, err }