Explorar el Código

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>
Christopher Jones hace 9 años
padre
commit
7832e2ae82
Se han modificado 1 ficheros con 1 adiciones y 1 borrados
  1. 1 1
      integration-cli/docker_cli_daemon_test.go

+ 1 - 1
integration-cli/docker_cli_daemon_test.go

@@ -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",