Updates output string and fixes failed unit test.

kubernetes · Feb 10, 2021 · 6d8ecdf · 6d8ecdf
1 parent 8620ab6
commit 6d8ecdf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
@@ -280,7 +280,7 @@ func Suggest(options []registry.DriverState) (registry.DriverState, []registry.D
 			}
 
 			if pick.Name == "" {
-				ds.Rejection = "Rejected due to low priority"
+				ds.Rejection = fmt.Sprintf("Not selected: %s must be specified explicitly using --driver", ds.Name)
 			} else {
 				ds.Rejection = fmt.Sprintf("%s is preferred", pick.Name)
 			}

diff --git a/pkg/minikube/driver/driver_test.go b/pkg/minikube/driver/driver_test.go
@@ -119,7 +119,7 @@ func TestSuggest(t *testing.T) {
 		{
 			def: registry.DriverDef{
 				Name:     "unhealthy",
-				Priority: registry.Default,
+				Priority: registry.Deprecated,
 				Status:   func() registry.State { return registry.State{Installed: true, Healthy: false} },
 			},
 			choices: []string{"unhealthy"},
@@ -144,7 +144,7 @@ func TestSuggest(t *testing.T) {
 				Priority: registry.Default,
 				Status:   func() registry.State { return registry.State{Installed: true, Healthy: true} },
 			},
-			choices: []string{"unhealthy", "default", "discouraged"},
+			choices: []string{"default", "unhealthy", "discouraged"},
 			pick:    "default",
 			alts:    []string{"discouraged"},
 			rejects: []string{"unhealthy"},
@@ -155,7 +155,7 @@ func TestSuggest(t *testing.T) {
 				Priority: registry.Preferred,
 				Status:   func() registry.State { return registry.State{Installed: true, Healthy: true} },
 			},
-			choices: []string{"preferred", "unhealthy", "default", "discouraged"},
+			choices: []string{"preferred", "default", "unhealthy", "discouraged"},
 			pick:    "preferred",
 			alts:    []string{"default", "discouraged"},
 			rejects: []string{"unhealthy"},

diff --git a/pkg/minikube/registry/global_test.go b/pkg/minikube/registry/global_test.go
@@ -73,7 +73,7 @@ func TestGlobalAvailable(t *testing.T) {
 
 	bar := DriverDef{
 		Name:     "healthy-bar",
-		Priority: Default,
+		Priority: Preferred,
 		Status:   func() State { return State{Healthy: true} },
 	}
 	if err := Register(bar); err != nil {
@@ -82,7 +82,7 @@ func TestGlobalAvailable(t *testing.T) {
 
 	foo := DriverDef{
 		Name:     "unhealthy-foo",
-		Priority: Default,
+		Priority: Fallback,
 		Status:   func() State { return State{Healthy: false} },
 	}
 	if err := Register(foo); err != nil {
@@ -92,12 +92,12 @@ func TestGlobalAvailable(t *testing.T) {
 	expected := []DriverState{
 		{
 			Name:     "healthy-bar",
-			Priority: Default,
+			Priority: Preferred,
 			State:    State{Healthy: true},
 		},
 		{
 			Name:     "unhealthy-foo",
-			Priority: Default,
+			Priority: Fallback,
 			State:    State{Healthy: false},
 		},
 	}