Merge pull request #22952 from tophj-ibm/multiarch_daemon_test_fix

Multi-arch: fix TestBuildOnDisabledBridgeNetworkDaemon
This commit is contained in:
Sebastiaan van Stijn 2016-05-25 10:19:41 +02:00
commit cd159fba85

View file

@ -2322,7 +2322,7 @@ func (s *DockerDaemonSuite) TestDaemonMaxConcurrencyWithConfigFileReload(c *chec
}
func (s *DockerDaemonSuite) TestBuildOnDisabledBridgeNetworkDaemon(c *check.C) {
err := s.d.Start("-b=none", "--iptables=false")
err := s.d.StartWithBusybox("-b=none", "--iptables=false")
c.Assert(err, check.IsNil)
s.d.c.Logf("dockerBinary %s", dockerBinary)
out, code, err := s.d.buildImageWithOut("busyboxs",