From c8bd24665b6b97b66bc9ecdf0cc4ae2b82e54651 Mon Sep 17 00:00:00 2001 From: unclejack Date: Wed, 23 Jul 2014 01:13:52 +0300 Subject: [PATCH] integcli: fix TestInspectLinksStopped with Go1.3 Docker-DCO-1.1-Signed-off-by: Cristian Staretu (github: unclejack) Upstream-commit: d0cbc54f234b01585670e19b49a8c931b2719472 Component: engine --- .../integration-cli/docker_cli_links_test.go | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_links_test.go b/components/engine/integration-cli/docker_cli_links_test.go index d5336a62c8..cb48866456 100644 --- a/components/engine/integration-cli/docker_cli_links_test.go +++ b/components/engine/integration-cli/docker_cli_links_test.go @@ -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") }