kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #17659 from cpuguy83/17646_keep_em_running

Browse source 
Fix network settings inspect tests
This commit is contained in:
Antonio Murdaca 2015-11-03 20:25:01 +01:00
commit 474b16af8e
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) { 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", containerID)
body := getInspectBody(c, "v1.20", cleanedContainerID)
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") out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
cleanedContainerID := strings.TrimSpace(out) 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)