commands: make ls to not report saved hosts to be active when $DOCKER_HOST is not set

skatsuta · skatsuta · commit 5af32bcdd35c · 2015-10-09T00:59:33.000+09:00
Signed-off-by: Soshi Katsuta &lt;soshi.katsuta@gmail.com&gt;
diff --git a/commands/ls.go b/commands/ls.go
@@ -342,10 +342,10 @@ func isActive(h *host.Host) (bool, error) {
 
 	dockerHost := os.Getenv("DOCKER_HOST")
 
-	notStopped := currentState != state.Stopped
+	running := currentState == state.Running
 	correctURL := url == dockerHost
 
-	isActive := notStopped && correctURL
+	isActive := running && correctURL
 
 	return isActive, nil
 }
diff --git a/commands/ls_test.go b/commands/ls_test.go
@@ -376,3 +376,92 @@ func TestGetHostListItems(t *testing.T) {
 		}
 	}
 }
+
+// issue #1908
+func TestGetHostListItemsEnvDockerHostUnset(t *testing.T) {
+	orgDockerHost := os.Getenv("DOCKER_HOST")
+	defer func() {
+		cleanup()
+
+		// revert DOCKER_HOST
+		os.Setenv("DOCKER_HOST", orgDockerHost)
+	}()
+
+	// unset DOCKER_HOST
+	os.Unsetenv("DOCKER_HOST")
+
+	hostListItemsChan := make(chan HostListItem)
+
+	hosts := []*host.Host{
+		{
+			Name:       "foo",
+			DriverName: "fakedriver",
+			Driver: &fakedriver.FakeDriver{
+				MockState: state.Running,
+				MockURL:   "tcp://120.0.0.1:2376",
+			},
+			HostOptions: &host.HostOptions{
+				SwarmOptions: &swarm.SwarmOptions{
+					Master:    false,
+					Address:   "",
+					Discovery: "",
+				},
+			},
+		},
+		{
+			Name:       "bar",
+			DriverName: "fakedriver",
+			Driver: &fakedriver.FakeDriver{
+				MockState: state.Stopped,
+			},
+			HostOptions: &host.HostOptions{
+				SwarmOptions: &swarm.SwarmOptions{
+					Master:    false,
+					Address:   "",
+					Discovery: "",
+				},
+			},
+		},
+		{
+			Name:       "baz",
+			DriverName: "fakedriver",
+			Driver: &fakedriver.FakeDriver{
+				MockState: state.Saved,
+			},
+			HostOptions: &host.HostOptions{
+				SwarmOptions: &swarm.SwarmOptions{
+					Master:    false,
+					Address:   "",
+					Discovery: "",
+				},
+			},
+		},
+	}
+
+	expected := map[string]struct {
+		state  state.State
+		active bool
+	}{
+		"foo": {state.Running, false},
+		"bar": {state.Stopped, false},
+		"baz": {state.Saved, false},
+	}
+
+	items := []HostListItem{}
+	for _, host := range hosts {
+		go getHostState(host, hostListItemsChan)
+	}
+
+	for i := 0; i < len(hosts); i++ {
+		items = append(items, <-hostListItemsChan)
+	}
+
+	for _, item := range items {
+		if expected[item.Name].state != item.State {
+			t.Fatal("Expected state did not match for item", item)
+		}
+		if expected[item.Name].active != item.Active {
+			t.Fatal("Expected active flag did not match for item", item)
+		}
+	}
+}
diff --git a/drivers/fakedriver/fakedriver.go b/drivers/fakedriver/fakedriver.go
@@ -8,6 +8,7 @@ import (
 type FakeDriver struct {
 	*drivers.BaseDriver
 	MockState state.State
+	MockURL   string
 	MockName  string
 }
 
@@ -20,7 +21,7 @@ func (d *FakeDriver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 }
 
 func (d *FakeDriver) GetURL() (string, error) {
-	return "", nil
+	return d.MockURL, nil
 }
 
 func (d *FakeDriver) GetMachineName() string {

Original file line number	Diff line number	Diff line change
`@@ -342,10 +342,10 @@ func isActive(h *host.Host) (bool, error) {`
`342`	`342`
`343`	`343`	`dockerHost := os.Getenv("DOCKER_HOST")`
`344`	`344`
`345`		`- notStopped := currentState != state.Stopped`
	`345`	`+ running := currentState == state.Running`
`346`	`346`	`correctURL := url == dockerHost`
`347`	`347`
`348`		`- isActive := notStopped && correctURL`
	`348`	`+ isActive := running && correctURL`
`349`	`349`
`350`	`350`	`return isActive, nil`
`351`	`351`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`type FakeDriver struct {`
`9`	`9`	`*drivers.BaseDriver`
`10`	`10`	`MockState state.State`
	`11`	`+ MockURL string`
`11`	`12`	`MockName string`
`12`	`13`	`}`
`13`	`14`
`@@ -20,7 +21,7 @@ func (d *FakeDriver) SetConfigFromFlags(flags drivers.DriverOptions) error {`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`func (d *FakeDriver) GetURL() (string, error) {`
`23`		`- return "", nil`
	`24`	`+ return d.MockURL, nil`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`func (d *FakeDriver) GetMachineName() string {`