don\'t return that the machine doesn\'t exist if the k8s is stopped

kubernetes · Feb 13, 2020 · 6d8a112 · 6d8a112
1 parent c1a3e43
commit 6d8a112
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
@@ -201,7 +201,7 @@ func adjustGuestClock(h hostRunner, t time.Time) error {
 func machineExists(d string, s state.State, err error) (bool, error) {
 	switch d {
 	case driver.HyperKit:
-		if s == state.Stopped || err.Error() == "connection is shut down" {
+		if s == state.None || (err != nil && err.Error() == "connection is shut down") {
 			return false, ErrorMachineNotExist
 		}
 		return true, err
@@ -211,17 +211,17 @@ func machineExists(d string, s state.State, err error) (bool, error) {
 		}
 		return true, err
 	case driver.KVM2:
-		if s == state.None || s == state.Stopped {
+		if s == state.None {
 			return false, ErrorMachineNotExist
 		}
 		return true, err
 	case driver.None:
-		if s == state.Stopped {
+		if s == state.None {
 			return false, ErrorMachineNotExist
 		}
 		return true, err
 	case driver.Parallels:
-		if err.Error() == "machine does not exist" {
+		if err != nil && err.Error() == "machine does not exist" {
 			return false, ErrorMachineNotExist
 		}
 		return true, err
@@ -231,12 +231,12 @@ func machineExists(d string, s state.State, err error) (bool, error) {
 		}
 		return true, err
 	case driver.VMware:
-		if s == state.None || s == state.Stopped {
+		if s == state.None {
 			return false, ErrorMachineNotExist
 		}
 		return true, err
 	case driver.VMwareFusion:
-		if s == state.Stopped {
+		if s == state.None {
 			return false, ErrorMachineNotExist
 		}
 		return true, err

diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go
@@ -37,9 +37,9 @@ import (
 	pkgutil "k8s.io/minikube/pkg/util"
 )
 
-// TestVersionUpgrade downloads latest version of minikube and runs with
-// the odlest supported k8s version and then runs the current head minikube
-// and it tries to upgrade from the older supported k8s to news supported k8s
+// TestVersionUpgrade downloads the latest version of minikube and runs with
+// the oldest supported k8s version and then runs the current head minikube
+// and tries to upgrade from the oldest supported k8s to newest supported k8s
 func TestVersionUpgrade(t *testing.T) {
 	MaybeParallel(t)
 	profile := UniqueProfileName("vupgrade")