فهرست منبع

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 <cpuguy83@gmail.com>
Brian Goff 9 سال پیش
والد
کامیت
3564895e84
1فایلهای تغییر یافته به همراه8 افزوده شده و 6 حذف شده
  1. 8 6
      integration-cli/docker_api_inspect_test.go

+ 8 - 6
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) {
 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
 	var inspectJSON v1p20.ContainerJSON
 	err := json.Unmarshal(body, &inspectJSON)
 	err := json.Unmarshal(body, &inspectJSON)
@@ -168,10 +169,11 @@ func (s *DockerSuite) TestInspectApiBridgeNetworkSettings120(c *check.C) {
 }
 }
 
 
 func (s *DockerSuite) TestInspectApiBridgeNetworkSettings121(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
 	var inspectJSON types.ContainerJSON
 	err := json.Unmarshal(body, &inspectJSON)
 	err := json.Unmarshal(body, &inspectJSON)