diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index cbb271de0db5da23a7a59e4a4a26ba074df58aa3..f851deafe0ac3bddd597cd3e39470691aba82a7a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1074,7 +1074,7 @@ jobs: chmod a+x e2e-* chmod a+x minikube-* START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.run "(TestPause|TestPreload|TestDockerFlags)" -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.run "(TestPause|TestPreload|TestDockerFlags)" -test.timeout=20m -test.v -timeout-multiplier=1.5 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) @@ -1164,7 +1164,7 @@ jobs: chmod a+x e2e-* chmod a+x minikube-* START_TIME=$(date -u +%s) - KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-darwin-amd64 -minikube-start-args=--vm-driver=virtualbox -test.run "(TestPause|TestPreload|TestDockerFlags)" -test.timeout=15m -test.v -timeout-multiplier=1.5 -binary=./minikube-darwin-amd64 2>&1 | tee ./report/testout.txt + KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-darwin-amd64 -minikube-start-args=--vm-driver=virtualbox -test.run "(TestPause|TestPreload|TestDockerFlags)" -test.timeout=20m -test.v -timeout-multiplier=1.5 -binary=./minikube-darwin-amd64 2>&1 | tee ./report/testout.txt END_TIME=$(date -u +%s) TIME_ELAPSED=$(($END_TIME-$START_TIME)) min=$((${TIME_ELAPSED}/60)) diff --git a/test/integration/pause_test.go b/test/integration/pause_test.go index 4b711c81901fad751255548a4c8d42f27542641e..d1a2525f431c03235166ea06cb9fac5fa5525c14 100644 --- a/test/integration/pause_test.go +++ b/test/integration/pause_test.go @@ -24,6 +24,8 @@ import ( "os/exec" "strings" "testing" + + "k8s.io/minikube/cmd/minikube/cmd" ) func TestPause(t *testing.T) { @@ -43,6 +45,7 @@ func TestPause(t *testing.T) { {"Start", validateFreshStart}, {"SecondStartNoReconfiguration", validateStartNoReconfigure}, {"Pause", validatePause}, + {"VerifyStatus", validateStatus}, {"Unpause", validateUnpause}, {"PauseAgain", validatePause}, {"DeletePaused", validateDelete}, @@ -166,3 +169,20 @@ func validateVerifyDeleted(ctx context.Context, t *testing.T, profile string) { } } + +func validateStatus(ctx context.Context, t *testing.T, profile string) { + defer PostMortemLogs(t, profile) + + statusOutput := runStatusCmd(ctx, t, profile, false) + var cs cmd.ClusterState + if err := json.Unmarshal(statusOutput, &cs); err != nil { + t.Fatalf("unmarshalling: %v", err) + } + // verify the status looks as we expect + if cs.StatusCode != cmd.Paused { + t.Fatalf("incorrect status code: %v", cs.StatusCode) + } + if cs.StatusName != "Paused" { + t.Fatalf("incorrect status name: %v", cs.StatusName) + } +} diff --git a/test/integration/status_test.go b/test/integration/status_test.go index 9980d0a4c6b17262a984e4fba007631385fd29b1..acdc2bd91aaf95a41d5e888b0b91d575aeb5f8b4 100644 --- a/test/integration/status_test.go +++ b/test/integration/status_test.go @@ -98,41 +98,3 @@ func verifyClusterState(t *testing.T, contents []byte) { } } } - -func TestPauseStatus(t *testing.T) { - // run start - profile := UniqueProfileName("pause-status") - ctx, cancel := context.WithTimeout(context.Background(), Minutes(5)) - defer Cleanup(t, profile, cancel) - - startArgs := []string{"start", "-p", profile, "--output=json", "--wait=true"} - startArgs = append(startArgs, StartArgs()...) - c := exec.CommandContext(ctx, Target(), startArgs...) - - rr, err := Run(t, c) - if err != nil { - t.Fatalf("minikube start failed %v\n%v", rr.Command(), err) - } - - // run pause - pauseArgs := []string{"pause", "-p", profile} - c = exec.CommandContext(ctx, Target(), pauseArgs...) - rr, err = Run(t, c) - if err != nil { - t.Fatalf("minikube pause failed %v\n%v", rr.Command(), err) - } - - // run status - statusOutput := runStatusCmd(context.Background(), t, profile, false) - var cs cmd.ClusterState - if err := json.Unmarshal(statusOutput, &cs); err != nil { - t.Fatalf("unmarshalling: %v", err) - } - // verify the status looks as we expect - if cs.StatusCode != cmd.Paused { - t.Fatalf("incorrect status code: %v", cs.StatusCode) - } - if cs.StatusName != "Paused" { - t.Fatalf("incorrect status name: %v", cs.StatusName) - } -}