Browse code

Fix TestRunWithRuntime* on arm

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

Kenfe-Mickael Laventure authored on 2016/06/15 10:59:22
Showing 1 changed files
... ...
@@ -2401,7 +2401,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) {
2401 2401
 }
2402 2402
 `
2403 2403
 	ioutil.WriteFile(configName, []byte(config), 0644)
2404
-	err = s.d.Start("--config-file", configName)
2404
+	err = s.d.StartWithBusybox("--config-file", configName)
2405 2405
 	c.Assert(err, check.IsNil)
2406 2406
 
2407 2407
 	// Run with default runtime
... ...
@@ -2497,7 +2497,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) {
2497 2497
 }
2498 2498
 
2499 2499
 func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) {
2500
-	err := s.d.Start("--add-runtime", "oci=docker-runc", "--add-runtime", "vm=/usr/local/bin/vm-manager")
2500
+	err := s.d.StartWithBusybox("--add-runtime", "oci=docker-runc", "--add-runtime", "vm=/usr/local/bin/vm-manager")
2501 2501
 	c.Assert(err, check.IsNil)
2502 2502
 
2503 2503
 	// Run with default runtime
... ...
@@ -2519,7 +2519,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) {
2519 2519
 
2520 2520
 	// Start a daemon without any extra runtimes
2521 2521
 	s.d.Stop()
2522
-	err = s.d.Start()
2522
+	err = s.d.StartWithBusybox()
2523 2523
 	c.Assert(err, check.IsNil)
2524 2524
 
2525 2525
 	// Run with default runtime
... ...
@@ -2546,7 +2546,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) {
2546 2546
 
2547 2547
 	// Check that we can select a default runtime
2548 2548
 	s.d.Stop()
2549
-	err = s.d.Start("--default-runtime=vm", "--add-runtime", "oci=docker-runc", "--add-runtime", "vm=/usr/local/bin/vm-manager")
2549
+	err = s.d.StartWithBusybox("--default-runtime=vm", "--add-runtime", "oci=docker-runc", "--add-runtime", "vm=/usr/local/bin/vm-manager")
2550 2550
 	c.Assert(err, check.IsNil)
2551 2551
 
2552 2552
 	out, err = s.d.Cmd("run", "--rm", "busybox", "ls")