Replaced driver "hyperkit" by "virtualbox" in testfiles
Removed debug codepull/4780/head
parent
b8abe562b3
commit
0c9cd491ce
|
@ -17,7 +17,6 @@ limitations under the License.
|
|||
package cluster
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"path/filepath"
|
||||
|
||||
|
@ -68,8 +67,6 @@ func ListMachines(miniHome ...string) (validMachines []*Machine, inValidMachines
|
|||
}
|
||||
for _, n := range pDirs {
|
||||
p, err := LoadMachine(n)
|
||||
fmt.Printf("MachineLoadError: %v", err)
|
||||
|
||||
if err != nil {
|
||||
inValidMachines = append(inValidMachines, p)
|
||||
continue
|
||||
|
|
|
@ -17,7 +17,6 @@ limitations under the License.
|
|||
package cluster
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
@ -52,10 +51,6 @@ func TestListMachines(t *testing.T) {
|
|||
files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines"))
|
||||
numberOfMachineDirs := len(files)
|
||||
|
||||
fmt.Println("Viper MachineProfile variable: " + viper.GetString(config.MachineProfile))
|
||||
fmt.Println("MINIKUBE_HOME: " + os.Getenv(localpath.MinikubeHome))
|
||||
fmt.Printf("Files: %v", files)
|
||||
|
||||
validMachines, inValidMachines, err := ListMachines()
|
||||
|
||||
if err != nil {
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
"Initrd": "initrd",
|
||||
"Vmlinuz": "bzImage"
|
||||
},
|
||||
"DriverName": "hyperkit",
|
||||
"DriverName": "virtualbox",
|
||||
"HostOptions": {
|
||||
"Driver": "",
|
||||
"Memory": 0,
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
"Initrd": "initrd",
|
||||
"Vmlinuz": "bzImage"
|
||||
},
|
||||
"DriverName": "hyperkit",
|
||||
"DriverName": "virtualbox",
|
||||
"HostOptions": {
|
||||
"Driver": "",
|
||||
"Memory": 0,
|
||||
|
|
|
@ -19,7 +19,6 @@ package machine
|
|||
import (
|
||||
"crypto/tls"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
@ -129,7 +128,6 @@ func (api *LocalClient) Load(name string) (*host.Host, error) {
|
|||
}
|
||||
|
||||
var def registry.DriverDef
|
||||
fmt.Println("Searching for driver: " + h.DriverName)
|
||||
if def, err = registry.Driver(h.DriverName); err != nil {
|
||||
return nil, err
|
||||
} else if !def.Builtin || def.DriverCreator == nil {
|
||||
|
|
|
@ -133,11 +133,6 @@ func (r *driverRegistry) Driver(name string) (DriverDef, error) {
|
|||
r.lock.Lock()
|
||||
defer r.lock.Unlock()
|
||||
|
||||
fmt.Println("Drivers: ")
|
||||
for _, d := range r.drivers {
|
||||
fmt.Println(d.Name)
|
||||
}
|
||||
|
||||
if driver, ok := r.drivers[name]; ok {
|
||||
return driver, nil
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue