address review comments

cmd/minikube/cmd/config/util.go

@@ -146,9 +146,9 @@ func isAddonAlreadySet(addon *assets.Addon, enable bool) error {
 	}
 
 	if addonStatus && enable {
-		return fmt.Errorf("addon %s was already enabled", addon.GetAddon())
+		return fmt.Errorf("addon %s was already enabled", addon.GetAddonName())
 	} else if !addonStatus && !enable {
-		return fmt.Errorf("addon %s was already disabled", addon.GetAddon())
+		return fmt.Errorf("addon %s was already disabled", addon.GetAddonName())
 	}
 
 	return nil
@@ -159,7 +159,7 @@ func enableOrDisableAddonInternal(addon *assets.Addon, cmd bootstrapper.CommandR
 	// check addon status before enabling/disabling it
 	if err := isAddonAlreadySet(addon, enable); err != nil {
 		console.ErrStyle(console.Conflict, "%v", err)
-		os.Exit(exit.Unavailable)
+		os.Exit(0)
 	}
 
 	if enable {

cmd/minikube/cmd/config/util_test.go

@@ -82,13 +82,31 @@ func TestSetBool(t *testing.T) {
 }
 
 func TestIsAddonAlreadySet(t *testing.T) {
-	names := []string{"ingress", "heapster"}
-	for _, name := range names {
-		addon := assets.Addons[name]
+	testCases := []struct {
+		addonName string
+		expectErr string
+	}{
+		{
+			addonName: "ingress",
+			expectErr: "addon ingress was already ",
+		},
+		{
+			addonName: "heapster",
+			expectErr: "addon heapster was already ",
+		},
+	}
+
+	for _, test := range testCases {
+		addon := assets.Addons[test.addonName]
 		addonStatus, _ := addon.IsEnabled()
+
+		expectMsg := test.expectErr + "enabled"
+		if !addonStatus {
+			expectMsg = test.expectErr + "disabled"
+		}
 		err := isAddonAlreadySet(addon, addonStatus)
-		if err == nil {
-			t.Fatalf("did not return error for the addon was already set")
+		if err.Error() != expectMsg {
+			t.Errorf("Did not get expected error, \n\n expected: %+v \n\n actual: %+v", expectMsg, err)
 		}
 	}
 }

pkg/minikube/assets/addons.go

@@ -47,8 +47,8 @@ func NewAddon(assets []*BinAsset, enabled bool, addonName string) *Addon {
 	return a
 }
 
-// GetAddon get the addon name
-func (a *Addon) GetAddon() string {
+// GetAddonName get the addon name
+func (a *Addon) GetAddonName() string {
 	return a.addonName
 }