InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix network settings inspect tests

Browse Source 
Makes sure the containers are actually running when inspecting so the
ip info is actually populated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff
2015-11-03 12:12:19 -05:00
parent 49f55b273b
commit 3564895e84
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
integration-cli/docker_api_inspect_test.go
View File

@@ -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)