toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22952 from tophj-ibm/multiarch_daemon_test_fix

Browse Source 
Multi-arch: fix TestBuildOnDisabledBridgeNetworkDaemon
Upstream-commit: cd159fba8529efe70ea634842a024560dbfd3aec
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2016-05-25 10:19:41 +02:00
parent d11b12b133 2e5b933fb0
commit 5912cc64b5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_daemon_test.go
+1 -1
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",