beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix TestRunWithRuntime* on arm

Browse source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit bd6317031b)
This commit is contained in:
Kenfe-Mickael Laventure 2016-06-14 18:59:22 -07:00 committed by Tibor Vass
parent cdb04519e2
commit e324ec639b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
integration-cli/docker_cli_daemon_test.go
View file

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