From e324ec639bb582c2b0275d15ab9aadcd80417026 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Tue, 14 Jun 2016 18:59:22 -0700 Subject: [PATCH] Fix TestRunWithRuntime* on arm Signed-off-by: Kenfe-Mickael Laventure (cherry picked from commit bd6317031bb8f7e1a82cbfd254fe60e0de703524) --- integration-cli/docker_cli_daemon_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index ac3fe75c28..b866f8ba04 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -2401,7 +2401,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) { } ` ioutil.WriteFile(configName, []byte(config), 0644) - err = s.d.Start("--config-file", configName) + err = s.d.StartWithBusybox("--config-file", configName) c.Assert(err, check.IsNil) // Run with default runtime @@ -2497,7 +2497,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) { } func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) { - err := s.d.Start("--add-runtime", "oci=docker-runc", "--add-runtime", "vm=/usr/local/bin/vm-manager") + err := s.d.StartWithBusybox("--add-runtime", "oci=docker-runc", "--add-runtime", "vm=/usr/local/bin/vm-manager") c.Assert(err, check.IsNil) // Run with default runtime @@ -2519,7 +2519,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) { // Start a daemon without any extra runtimes s.d.Stop() - err = s.d.Start() + err = s.d.StartWithBusybox() c.Assert(err, check.IsNil) // Run with default runtime @@ -2546,7 +2546,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) { // Check that we can select a default runtime s.d.Stop() - err = s.d.Start("--default-runtime=vm", "--add-runtime", "oci=docker-runc", "--add-runtime", "vm=/usr/local/bin/vm-manager") + err = s.d.StartWithBusybox("--default-runtime=vm", "--add-runtime", "oci=docker-runc", "--add-runtime", "vm=/usr/local/bin/vm-manager") c.Assert(err, check.IsNil) out, err = s.d.Cmd("run", "--rm", "busybox", "ls")