From 0c8ef0abe541d6d5698f19f33781d5a803565a75 Mon Sep 17 00:00:00 2001
From: Evan Hazlett <ejhazlett@gmail.com>
Date: Thu, 15 Jan 2015 14:37:24 -0500
Subject: [PATCH] updated tests

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
---
 commands_test.go        | 14 +++++++++++++-
 drivers/drivers_test.go |  8 ++++++--
 host.go                 |  4 ++++
 store_test.go           | 14 +++++++-------
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/commands_test.go b/commands_test.go
index 39e508e47b..126ce24a28 100644
--- a/commands_test.go
+++ b/commands_test.go
@@ -61,6 +61,18 @@ func (d *FakeDriver) Upgrade() error {
 	return nil
 }
 
+func (d *FakeDriver) StartDocker() error {
+	return nil
+}
+
+func (d *FakeDriver) StopDocker() error {
+	return nil
+}
+
+func (d *FakeDriver) GetDockerConfigDir() string {
+	return ""
+}
+
 func (d *FakeDriver) GetSSHCommand(args ...string) (*exec.Cmd, error) {
 	return &exec.Cmd{}, nil
 }
@@ -71,7 +83,7 @@ func TestGetHostState(t *testing.T) {
 		t.Fatal("Error creating tmp dir:", err)
 	}
 	hostListItems := make(chan hostListItem)
-	store := NewStore(storePath)
+	store := NewStore(storePath, "", "")
 	hosts := []Host{
 		{
 			Name:       "foo",
diff --git a/drivers/drivers_test.go b/drivers/drivers_test.go
index 488135d398..031eb3d189 100644
--- a/drivers/drivers_test.go
+++ b/drivers/drivers_test.go
@@ -8,7 +8,9 @@ import (
 
 func TestGetCreateFlags(t *testing.T) {
 	Register("foo", &RegisteredDriver{
-		New: func(machineName string, storePath string) (Driver, error) { return nil, nil },
+		New: func(machineName string, storePath string, caCert string, privateKey string) (Driver, error) {
+			return nil, nil
+		},
 		GetCreateFlags: func() []cli.Flag {
 			return []cli.Flag{
 				cli.StringFlag{
@@ -33,7 +35,9 @@ func TestGetCreateFlags(t *testing.T) {
 		},
 	})
 	Register("bar", &RegisteredDriver{
-		New: func(machineName string, storePath string) (Driver, error) { return nil, nil },
+		New: func(machineName string, storePath string, caCert string, privateKey string) (Driver, error) {
+			return nil, nil
+		},
 		GetCreateFlags: func() []cli.Flag {
 			return []cli.Flag{
 				cli.StringFlag{
diff --git a/host.go b/host.go
index 551cb1044c..2b540a8241 100644
--- a/host.go
+++ b/host.go
@@ -142,6 +142,10 @@ func (h *Host) GenerateCertificates(serverIPs []string) error {
 func (h *Host) ConfigureAuth() error {
 	d := h.Driver
 
+	if d.DriverName() == "none" {
+		return nil
+	}
+
 	ip, err := d.GetIP()
 	if err != nil {
 		return err
diff --git a/store_test.go b/store_test.go
index b78f35557d..aaf38165c0 100644
--- a/store_test.go
+++ b/store_test.go
@@ -41,7 +41,7 @@ func TestStoreCreate(t *testing.T) {
 		},
 	}
 
-	store := NewStore("")
+	store := NewStore("", "", "")
 
 	host, err := store.Create("test", "none", flags)
 	if err != nil {
@@ -67,7 +67,7 @@ func TestStoreRemove(t *testing.T) {
 		},
 	}
 
-	store := NewStore("")
+	store := NewStore("", "", "")
 	_, err := store.Create("test", "none", flags)
 	if err != nil {
 		t.Fatal(err)
@@ -96,7 +96,7 @@ func TestStoreList(t *testing.T) {
 		},
 	}
 
-	store := NewStore("")
+	store := NewStore("", "", "")
 	_, err := store.Create("test", "none", flags)
 	if err != nil {
 		t.Fatal(err)
@@ -121,7 +121,7 @@ func TestStoreExists(t *testing.T) {
 		},
 	}
 
-	store := NewStore("")
+	store := NewStore("", "", "")
 	exists, err := store.Exists("test")
 	if exists {
 		t.Fatal("Exists returned true when it should have been false")
@@ -151,13 +151,13 @@ func TestStoreLoad(t *testing.T) {
 		},
 	}
 
-	store := NewStore("")
+	store := NewStore("", "", "")
 	_, err := store.Create("test", "none", flags)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	store = NewStore("")
+	store = NewStore("", "", "")
 	host, err := store.Load("test")
 	if host.Name != "test" {
 		t.Fatal("Host name is incorrect")
@@ -182,7 +182,7 @@ func TestStoreGetSetActive(t *testing.T) {
 		},
 	}
 
-	store := NewStore("")
+	store := NewStore("", "", "")
 
 	// No hosts set
 	host, err := store.GetActive()