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

Merge pull request #18131 from hypriot/18124-use-startwithbusybox

Fix integration-cli tests
This commit is contained in:
Michael Crosby 2015-11-20 14:20:12 -08:00
commit 8022e6292e

View file

@ -753,7 +753,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkMultipleNetworksGracefulDaemonRest
cName := "bb" cName := "bb"
nwList := []string{"nw1", "nw2", "nw3"} nwList := []string{"nw1", "nw2", "nw3"}
s.d.Start() s.d.StartWithBusybox()
connectContainerToNetworks(c, s.d, cName, nwList) connectContainerToNetworks(c, s.d, cName, nwList)
verifyContainerIsConnectedToNetworks(c, s.d, cName, nwList) verifyContainerIsConnectedToNetworks(c, s.d, cName, nwList)
@ -771,7 +771,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkMultipleNetworksUngracefulDaemonRe
cName := "cc" cName := "cc"
nwList := []string{"nw1", "nw2", "nw3"} nwList := []string{"nw1", "nw2", "nw3"}
s.d.Start() s.d.StartWithBusybox()
connectContainerToNetworks(c, s.d, cName, nwList) connectContainerToNetworks(c, s.d, cName, nwList)
verifyContainerIsConnectedToNetworks(c, s.d, cName, nwList) verifyContainerIsConnectedToNetworks(c, s.d, cName, nwList)
@ -796,7 +796,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkRunNetByID(c *check.C) {
func (s *DockerNetworkSuite) TestDockerNetworkHostModeUngracefulDaemonRestart(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkHostModeUngracefulDaemonRestart(c *check.C) {
testRequires(c, DaemonIsLinux, NotUserNamespace) testRequires(c, DaemonIsLinux, NotUserNamespace)
s.d.Start() s.d.StartWithBusybox()
// Run a few containers on host network // Run a few containers on host network
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {