From 3564895e84278311ecafaab923f5f753aba32aba Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Tue, 3 Nov 2015 12:12:19 -0500 Subject: [PATCH] Fix network settings inspect tests Makes sure the containers are actually running when inspecting so the ip info is actually populated. Signed-off-by: Brian Goff --- integration-cli/docker_api_inspect_test.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/integration-cli/docker_api_inspect_test.go b/integration-cli/docker_api_inspect_test.go index 8a2e0e3092..bf31adcff3 100644 --- a/integration-cli/docker_api_inspect_test.go +++ b/integration-cli/docker_api_inspect_test.go @@ -154,10 +154,11 @@ func (s *DockerSuite) TestInspectApiEmptyFieldsInConfigPre121(c *check.C) { } func (s *DockerSuite) TestInspectApiBridgeNetworkSettings120(c *check.C) { - out, _ := dockerCmd(c, "run", "-d", "busybox", "true") + out, _ := dockerCmd(c, "run", "-d", "busybox", "top") + containerID := strings.TrimSpace(out) + waitRun(containerID) - cleanedContainerID := strings.TrimSpace(out) - body := getInspectBody(c, "v1.20", cleanedContainerID) + body := getInspectBody(c, "v1.20", containerID) var inspectJSON v1p20.ContainerJSON err := json.Unmarshal(body, &inspectJSON) @@ -168,10 +169,11 @@ func (s *DockerSuite) TestInspectApiBridgeNetworkSettings120(c *check.C) { } func (s *DockerSuite) TestInspectApiBridgeNetworkSettings121(c *check.C) { - out, _ := dockerCmd(c, "run", "-d", "busybox", "true") - cleanedContainerID := strings.TrimSpace(out) + out, _ := dockerCmd(c, "run", "-d", "busybox", "top") + containerID := strings.TrimSpace(out) + waitRun(containerID) - body := getInspectBody(c, "v1.21", cleanedContainerID) + body := getInspectBody(c, "v1.21", containerID) var inspectJSON types.ContainerJSON err := json.Unmarshal(body, &inspectJSON)