docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #802 from ehazlett/revert-772 

revert "function GetActive should return real error when file doesn't ex...
This commit is contained in:
Evan Hazlett 2015-03-18 11:07:50 -04:00
parent bc9b390bde 391e97b9b4
commit a9fce41071
3 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
host_test.go
View File

@ -164,16 +164,12 @@ func TestMachinePort(t *testing.T) {
} }
flags := getTestDriverFlags() flags := getTestDriverFlags()
host, err := store.Create(hostTestName, hostTestDriverName, flags) _, err = store.Create(hostTestName, hostTestDriverName, flags)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if err := store.SetActive(host); err != nil { host, err := store.Load(hostTestName)
t.Fatalf("error setting active host: %v", err)
}
host, err = store.Load(hostTestName)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -211,16 +207,12 @@ func TestMachineCustomPort(t *testing.T) {
} }
flags := getTestDriverFlags() flags := getTestDriverFlags()
host, err := store.Create(hostTestName, hostTestDriverName, flags) _, err = store.Create(hostTestName, hostTestDriverName, flags)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if err := store.SetActive(host); err != nil { host, err := store.Load(hostTestName)
t.Fatalf("error setting active host: %v", err)
}
host, err = store.Load(hostTestName)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -262,10 +254,6 @@ func TestHostConfig(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if err := store.SetActive(host); err != nil {
t.Fatalf("error setting active host: %v", err)
}
if err := host.SaveConfig(); err != nil { if err := host.SaveConfig(); err != nil {
t.Fatal(err) t.Fatal(err)
} }

2
store.go
View File

@ -142,7 +142,7 @@ func (s *Store) Load(name string) (*Host, error) {
func (s *Store) GetActive() (*Host, error) { func (s *Store) GetActive() (*Host, error) {
hostName, err := ioutil.ReadFile(s.activePath()) hostName, err := ioutil.ReadFile(s.activePath())
if os.IsNotExist(err) { if os.IsNotExist(err) {
return nil, fmt.Errorf("no active host") return nil, nil
} else if err != nil { } else if err != nil {
return nil, err return nil, err
} }

13
store_test.go
View File

@ -79,13 +79,10 @@ func TestStoreRemove(t *testing.T) {
flags := getDefaultTestDriverFlags() flags := getDefaultTestDriverFlags()
store := NewStore(TestStoreDir, "", "") store := NewStore(TestStoreDir, "", "")
host, err := store.Create("test", "none", flags) _, err := store.Create("test", "none", flags)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if err := store.SetActive(host); err != nil {
t.Fatalf("error setting active host: %v", err)
}
path := filepath.Join(TestStoreDir, "test") path := filepath.Join(TestStoreDir, "test")
if _, err := os.Stat(path); os.IsNotExist(err) { if _, err := os.Stat(path); os.IsNotExist(err) {
t.Fatalf("Host path doesn't exist: %s", path) t.Fatalf("Host path doesn't exist: %s", path)
@ -189,9 +186,7 @@ func TestStoreGetSetActive(t *testing.T) {
// No hosts set // No hosts set
host, err := store.GetActive() host, err := store.GetActive()
if err.Error() == "no active host" { if err != nil {
t.Logf("OK, no active host initially: %v", err)
} else if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -230,9 +225,7 @@ func TestStoreGetSetActive(t *testing.T) {
} }
host, err = store.GetActive() host, err = store.GetActive()
if err.Error() == "no active host" { if err != nil {
t.Logf("OK, success to remove active host: %v", err)
} else if err != nil {
t.Fatal(err) t.Fatal(err)
} }