From 2e5b933fb0e35f7d7ec74c6eb550c67fd125fc76 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Tue, 24 May 2016 16:28:06 -0400 Subject: [PATCH] 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 Upstream-commit: 7832e2ae82ae56e9719c6930b054f643285a79b3 Component: engine --- components/engine/integration-cli/docker_cli_daemon_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/integration-cli/docker_cli_daemon_test.go b/components/engine/integration-cli/docker_cli_daemon_test.go index f4a352ec06..3255765aab 100644 --- a/components/engine/integration-cli/docker_cli_daemon_test.go +++ b/components/engine/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",