toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7170 from unclejack/fix_testinspectlinksstopped

Browse Source 
integcli: fix TestInspectLinksStopped with Go1.3
Upstream-commit: 92cba0845c046c0dac2af74b5d717bc799c91984
Component: engine
This commit is contained in:
Michael Crosby
2014-07-23 11:19:11 -07:00
parent 78b5f15752 c8bd24665b
commit b6bbf7e188
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_links_test.go
+18 -3
View File
@@ -122,16 +122,31 @@ func TestInspectLinksStarted(t *testing.T) {
}
func TestInspectLinksStopped(t *testing.T) {
var (
expected = map[string]struct{}{"/container1:/testinspectlink/alias1": {}, "/container2:/testinspectlink/alias2": {}}
result []string
)
defer deleteAllContainers()
cmd(t, "run", "-d", "--name", "container1", "busybox", "sleep", "10")
cmd(t, "run", "-d", "--name", "container2", "busybox", "sleep", "10")
cmd(t, "run", "-d", "--name", "testinspectlink", "--link", "container1:alias1", "--link", "container2:alias2", "busybox", "true")
links, err := inspectField("testinspectlink", "HostConfig.Links")
links, err := inspectFieldJSON("testinspectlink", "HostConfig.Links")
if err != nil {
t.Fatal(err)
}
if expected := "[/container1:/testinspectlink/alias1 /container2:/testinspectlink/alias2]"; links != expected {
t.Fatalf("Links %s, but expected %s", links, expected)
err = unmarshalJSON([]byte(links), &result)
if err != nil {
t.Fatal(err)
}
output := convertSliceOfStringsToMap(result)
equal := deepEqual(expected, output)
if !equal {
t.Fatalf("Links %s, but expected %s", result, expected)
}
logDone("link - links in stopped container inspect")
}