docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Multi-arch: fix TestBuildOnDisabledBridgeNetworkDaemon 

Fixes the test by loading in the architecture specific busybox
image when the test daemon starts.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
This commit is contained in:
Christopher Jones 2016-05-24 16:28:06 -04:00
parent 86a7632d63
commit 7832e2ae82
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration-cli/docker_cli_daemon_test.go
View File

@ -2322,7 +2322,7 @@ func (s *DockerDaemonSuite) TestDaemonMaxConcurrencyWithConfigFileReload(c *chec
} }
func (s *DockerDaemonSuite) TestBuildOnDisabledBridgeNetworkDaemon(c *check.C) { 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) c.Assert(err, check.IsNil)
s.d.c.Logf("dockerBinary %s", dockerBinary) s.d.c.Logf("dockerBinary %s", dockerBinary)
out, code, err := s.d.buildImageWithOut("busyboxs", out, code, err := s.d.buildImageWithOut("busyboxs",