Test stop and start

test/integration/addons_test.go

@@ -220,16 +220,23 @@ func testGvisor(t *testing.T) {
 func testGvisorRestart(t *testing.T) {
 	minikubeRunner := NewMinikubeRunner(t)
 	minikubeRunner.EnsureRunning()
-	fmt.Println("enabling gvisor")
 	minikubeRunner.RunCommand("addons enable gvisor", true)
 
 	t.Log("waiting for gvisor controller to come up")
 	if err := util.WaitForGvisorControllerRunning(t); err != nil {
 		t.Fatalf("waiting for gvisor controller to be up: %v", err)
 	}
 
-	minikubeRunner.RunCommand("delete", false)
-	minikubeRunner.CheckStatus(state.None.String())
+	checkStop := func() error {
+		minikubeRunner.RunCommand("stop", true)
+		return minikubeRunner.CheckStatusNoFail(state.Stopped.String())
+	}
+
+	fmt.Println("trying to stop")
+	if err := util.Retry(t, checkStop, 5*time.Second, 6); err != nil {
+		t.Fatalf("timed out while checking stopped status: %v", err)
+	}
+
 	minikubeRunner.Start()
 	minikubeRunner.CheckStatus(state.Running.String())
 

test/integration/util/util.go

@@ -126,8 +126,7 @@ func (m *MinikubeRunner) SSH(command string) (string, error) {
 func (m *MinikubeRunner) Start() {
 	switch r := m.Runtime; r {
 	case constants.ContainerdRuntime:
-		// TODO: priyawadhwa@ remove iso url once updated iso is being used in integration tests
-		containerdFlags := "--container-runtime=containerd --network-plugin=cni --docker-opt containerd=/var/run/containerd/containerd.sock --iso-url=https://storage.googleapis.com/k8s-minikube/gvisor-preview.iso"
+		containerdFlags := "--container-runtime=containerd --network-plugin=cni --docker-opt containerd=/var/run/containerd/containerd.sock"
 		m.RunCommand(fmt.Sprintf("start %s %s %s", m.StartArgs, m.Args, containerdFlags), true)
 	default:
 		m.RunCommand(fmt.Sprintf("start %s %s", m.StartArgs, m.Args), true)