From 13cba07ec8b957c750496f5e15fc57f24b8fa1ed Mon Sep 17 00:00:00 2001
From: tstromberg <tstromberg@google.com>
Date: Fri, 18 Oct 2019 15:48:26 -0700
Subject: [PATCH] Fix broken cluster_test

---
 cmd/minikube/main.go                 |  3 +++
 pkg/minikube/cluster/cluster.go      |  1 -
 pkg/minikube/cluster/cluster_test.go |  3 +++
 pkg/minikube/cluster/machine.go      |  2 ++
 pkg/minikube/driver/constants.go     | 30 ----------------------------
 pkg/minikube/driver/driver.go        | 12 +++++++++++
 6 files changed, 20 insertions(+), 31 deletions(-)
 delete mode 100644 pkg/minikube/driver/constants.go

diff --git a/cmd/minikube/main.go b/cmd/minikube/main.go
index 07447973ce..8ef1b3a007 100644
--- a/cmd/minikube/main.go
+++ b/cmd/minikube/main.go
@@ -28,6 +28,9 @@ import (
 	// Fix for https://github.com/kubernetes/minikube/issues/4866
 	_ "k8s.io/minikube/pkg/initflag"
 
+	// Register drivers
+	_ "k8s.io/minikube/pkg/minikube/registry/drvs"
+
 	mlog "github.com/docker/machine/libmachine/log"
 
 	"github.com/golang/glog"
diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go
index 9db2875444..64988a17be 100644
--- a/pkg/minikube/cluster/cluster.go
+++ b/pkg/minikube/cluster/cluster.go
@@ -51,7 +51,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/registry"
-	_ "k8s.io/minikube/pkg/minikube/registry/drvs"
 	pkgutil "k8s.io/minikube/pkg/util"
 	"k8s.io/minikube/pkg/util/retry"
 )
diff --git a/pkg/minikube/cluster/cluster_test.go b/pkg/minikube/cluster/cluster_test.go
index 194a775c25..62d7fd3f48 100644
--- a/pkg/minikube/cluster/cluster_test.go
+++ b/pkg/minikube/cluster/cluster_test.go
@@ -22,6 +22,9 @@ import (
 	"testing"
 	"time"
 
+	// Register drivers
+	_ "k8s.io/minikube/pkg/minikube/registry/drvs"
+
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/host"
 	"github.com/docker/machine/libmachine/provision"
diff --git a/pkg/minikube/cluster/machine.go b/pkg/minikube/cluster/machine.go
index 8a24b04e3c..60c96ebcf4 100644
--- a/pkg/minikube/cluster/machine.go
+++ b/pkg/minikube/cluster/machine.go
@@ -21,6 +21,7 @@ import (
 	"path/filepath"
 
 	"github.com/docker/machine/libmachine/host"
+	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/machine"
@@ -68,6 +69,7 @@ func ListMachines(miniHome ...string) (validMachines []*Machine, inValidMachines
 	for _, n := range pDirs {
 		p, err := LoadMachine(n)
 		if err != nil {
+			glog.Infof("%s not valid: %v", n, err)
 			inValidMachines = append(inValidMachines, p)
 			continue
 		}
diff --git a/pkg/minikube/driver/constants.go b/pkg/minikube/driver/constants.go
deleted file mode 100644
index c9fdeb45cb..0000000000
--- a/pkg/minikube/driver/constants.go
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2019 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package driver
-
-const (
-	// Driver names
-	Mock         = "mock-driver"
-	None         = "none"
-	KVM2         = "kvm2"
-	VirtualBox   = "virtualbox"
-	HyperKit     = "hyperkit"
-	VMware       = "vmware"
-	VMwareFusion = "vmwarefusion"
-	HyperV       = "hyperv"
-	Parallels    = "parallels"
-)
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
index 53bde69bb2..7d6712d8ea 100644
--- a/pkg/minikube/driver/driver.go
+++ b/pkg/minikube/driver/driver.go
@@ -21,6 +21,18 @@ import (
 	"os"
 )
 
+const (
+	Mock         = "mock"
+	None         = "none"
+	KVM2         = "kvm2"
+	VirtualBox   = "virtualbox"
+	HyperKit     = "hyperkit"
+	VMware       = "vmware"
+	VMwareFusion = "vmwarefusion"
+	HyperV       = "hyperv"
+	Parallels    = "parallels"
+)
+
 // SupportedDrivers returns a list of supported drivers
 func SupportedDrivers() []string {
 	return supportedDrivers