mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-10-24 09:13:09 +03:00
Code Activity

Merge pull request #29947 from vdemeester/integration-some-runCommandWithOutput-clean

Browse Source 
[test-integration] clean some runCommandWithOutput
This commit is contained in:
Sebastiaan van Stijn
2017-01-10 15:56:42 +01:00
committed by GitHub
parent 9c96768eae 303b1d200a
commit e5058ff15c
27 changed files with 696 additions and 1102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
integration-cli/docker_cli_network_unix_test.go
View File

@@ -803,15 +803,14 @@ func (s *DockerDaemonSuite) TestDockerNetworkNoDiscoveryDefaultBridgeNetwork(c *
hostsFile := "/etc/hosts"
bridgeName := "external-bridge"
bridgeIP := "192.169.255.254/24"
out, err := createInterface(c, "bridge", bridgeName, bridgeIP)
c.Assert(err, check.IsNil, check.Commentf(out))
createInterface(c, "bridge", bridgeName, bridgeIP)
defer deleteInterface(c, bridgeName)
s.d.StartWithBusybox(c, "--bridge", bridgeName)
defer s.d.Restart(c)
// run two containers and store first container's etc/hosts content
out, err = s.d.Cmd("run", "-d", "busybox", "top")
out, err := s.d.Cmd("run", "-d", "busybox", "top")
c.Assert(err, check.IsNil)
cid1 := strings.TrimSpace(out)
defer s.d.Cmd("stop", cid1)