From 391e97b9b46bd6541c63010af14fe8effb38df32 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Wed, 18 Mar 2015 11:01:10 -0400 Subject: [PATCH] revert "function GetActive should return real error when file doesn't exist" This reverts commit 036b6b07b28845ce54c3c826363a4c0c7d04cadd. Signed-off-by: Evan Hazlett --- host_test.go | 20 ++++---------------- store.go | 2 +- store_test.go | 13 +++---------- 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/host_test.go b/host_test.go index fff255226c..faf4317447 100644 --- a/host_test.go +++ b/host_test.go @@ -164,16 +164,12 @@ func TestMachinePort(t *testing.T) { } flags := getTestDriverFlags() - host, err := store.Create(hostTestName, hostTestDriverName, flags) + _, err = store.Create(hostTestName, hostTestDriverName, flags) if err != nil { t.Fatal(err) } - if err := store.SetActive(host); err != nil { - t.Fatalf("error setting active host: %v", err) - } - - host, err = store.Load(hostTestName) + host, err := store.Load(hostTestName) if err != nil { t.Fatal(err) } @@ -211,16 +207,12 @@ func TestMachineCustomPort(t *testing.T) { } flags := getTestDriverFlags() - host, err := store.Create(hostTestName, hostTestDriverName, flags) + _, err = store.Create(hostTestName, hostTestDriverName, flags) if err != nil { t.Fatal(err) } - if err := store.SetActive(host); err != nil { - t.Fatalf("error setting active host: %v", err) - } - - host, err = store.Load(hostTestName) + host, err := store.Load(hostTestName) if err != nil { t.Fatal(err) } @@ -262,10 +254,6 @@ func TestHostConfig(t *testing.T) { t.Fatal(err) } - if err := store.SetActive(host); err != nil { - t.Fatalf("error setting active host: %v", err) - } - if err := host.SaveConfig(); err != nil { t.Fatal(err) } diff --git a/store.go b/store.go index d603dd1b22..b946172a4e 100644 --- a/store.go +++ b/store.go @@ -142,7 +142,7 @@ func (s *Store) Load(name string) (*Host, error) { func (s *Store) GetActive() (*Host, error) { hostName, err := ioutil.ReadFile(s.activePath()) if os.IsNotExist(err) { - return nil, fmt.Errorf("no active host") + return nil, nil } else if err != nil { return nil, err } diff --git a/store_test.go b/store_test.go index 89bebcce60..8490dd7055 100644 --- a/store_test.go +++ b/store_test.go @@ -79,13 +79,10 @@ func TestStoreRemove(t *testing.T) { flags := getDefaultTestDriverFlags() store := NewStore(TestStoreDir, "", "") - host, err := store.Create("test", "none", flags) + _, err := store.Create("test", "none", flags) if err != nil { t.Fatal(err) } - if err := store.SetActive(host); err != nil { - t.Fatalf("error setting active host: %v", err) - } path := filepath.Join(TestStoreDir, "test") if _, err := os.Stat(path); os.IsNotExist(err) { t.Fatalf("Host path doesn't exist: %s", path) @@ -189,9 +186,7 @@ func TestStoreGetSetActive(t *testing.T) { // No hosts set host, err := store.GetActive() - if err.Error() == "no active host" { - t.Logf("OK, no active host initially: %v", err) - } else if err != nil { + if err != nil { t.Fatal(err) } @@ -230,9 +225,7 @@ func TestStoreGetSetActive(t *testing.T) { } host, err = store.GetActive() - if err.Error() == "no active host" { - t.Logf("OK, success to remove active host: %v", err) - } else if err != nil { + if err != nil { t.Fatal(err) }