Skip to content
This repository was archived by the owner on Dec 17, 2021. It is now read-only.

Commit b78ab1c

Browse files
committed
commands/ls: Update tests for lambda-machine-local changes
1 parent 6e710bd commit b78ab1c

File tree

1 file changed

+0
-88
lines changed

1 file changed

+0
-88
lines changed

commands/ls_test.go

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -266,58 +266,6 @@ func TestFilterHostsDifferentFlagsProduceAND(t *testing.T) {
266266
assert.Empty(t, filterHosts(hosts, opts))
267267
}
268268

269-
func TestGetHostListItems(t *testing.T) {
270-
defer func(versioner mcndockerclient.DockerVersioner) { mcndockerclient.CurrentDockerVersioner = versioner }(mcndockerclient.CurrentDockerVersioner)
271-
mcndockerclient.CurrentDockerVersioner = &mcndockerclient.FakeDockerVersioner{Version: "1.9"}
272-
273-
// TODO: Ideally this would mockable via interface instead.
274-
defer func(host string) { os.Setenv("DOCKER_HOST", host) }(os.Getenv("DOCKER_HOST"))
275-
os.Setenv("DOCKER_HOST", "tcp://active.host.com:2376")
276-
277-
hosts := []*host.Host{
278-
{
279-
Name: "foo",
280-
Driver: &fakedriver.Driver{
281-
MockState: state.Running,
282-
MockIP: "active.host.com",
283-
},
284-
},
285-
{
286-
Name: "bar100",
287-
Driver: &fakedriver.Driver{
288-
MockState: state.Stopped,
289-
},
290-
},
291-
{
292-
Name: "bar10",
293-
Driver: &fakedriver.Driver{
294-
MockState: state.Error,
295-
},
296-
},
297-
}
298-
299-
expected := []struct {
300-
name string
301-
state state.State
302-
active bool
303-
version string
304-
error string
305-
}{
306-
{"bar10", state.Error, false, "Unknown", "Unable to get ip"},
307-
{"bar100", state.Stopped, false, "Unknown", ""},
308-
{"foo", state.Running, true, "v1.9", ""},
309-
}
310-
311-
items := getHostListItems(hosts, map[string]error{}, 10*time.Second)
312-
313-
for i := range expected {
314-
assert.Equal(t, expected[i].name, items[i].Name)
315-
assert.Equal(t, expected[i].state, items[i].State)
316-
assert.Equal(t, expected[i].version, items[i].DockerVersion)
317-
assert.Equal(t, expected[i].error, items[i].Error)
318-
}
319-
}
320-
321269
func TestGetHostListItemsEnvDockerHostUnset(t *testing.T) {
322270
defer func(versioner mcndockerclient.DockerVersioner) { mcndockerclient.CurrentDockerVersioner = versioner }(mcndockerclient.CurrentDockerVersioner)
323271
mcndockerclient.CurrentDockerVersioner = &mcndockerclient.FakeDockerVersioner{Version: "1.9"}
@@ -365,42 +313,6 @@ func TestGetHostListItemsEnvDockerHostUnset(t *testing.T) {
365313
}
366314
}
367315

368-
func TestGetHostStateTimeout(t *testing.T) {
369-
hosts := []*host.Host{
370-
{
371-
Name: "foo",
372-
Driver: &fakedriver.Driver{
373-
MockState: state.Timeout,
374-
},
375-
},
376-
}
377-
378-
hostItem := getHostListItems(hosts, nil, time.Millisecond)[0]
379-
380-
assert.Equal(t, "foo", hostItem.Name)
381-
assert.Equal(t, state.Timeout, hostItem.State)
382-
assert.Equal(t, "Driver", hostItem.DriverName)
383-
assert.Equal(t, time.Millisecond, hostItem.ResponseTime)
384-
}
385-
386-
func TestGetHostStateError(t *testing.T) {
387-
hosts := []*host.Host{
388-
{
389-
Name: "foo",
390-
Driver: &fakedriver.Driver{
391-
MockState: state.Error,
392-
},
393-
},
394-
}
395-
396-
hostItem := getHostListItems(hosts, nil, 10*time.Second)[0]
397-
398-
assert.Equal(t, "foo", hostItem.Name)
399-
assert.Equal(t, state.Error, hostItem.State)
400-
assert.Equal(t, "Driver", hostItem.DriverName)
401-
assert.Equal(t, "Unable to get ip", hostItem.Error)
402-
}
403-
404316
func TestGetSomeHostInError(t *testing.T) {
405317
defer func(versioner mcndockerclient.DockerVersioner) { mcndockerclient.CurrentDockerVersioner = versioner }(mcndockerclient.CurrentDockerVersioner)
406318
mcndockerclient.CurrentDockerVersioner = &mcndockerclient.FakeDockerVersioner{Version: "1.9"}

0 commit comments

Comments
 (0)