From 481cc6716fdfda8db4481dd2a3dfde4d3d2edba5 Mon Sep 17 00:00:00 2001 From: John Howard Date: Tue, 3 May 2016 10:52:09 -0700 Subject: [PATCH] RunSleepingContainer consistency Signed-off-by: John Howard --- integration-cli/docker_cli_run_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 0ca0ba9f25..6fedfcbfc7 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -2710,8 +2710,8 @@ func (s *DockerSuite) TestRunAllowPortRangeThroughPublish(c *check.C) { } func (s *DockerSuite) TestRunSetDefaultRestartPolicy(c *check.C) { - dockerCmd(c, "run", "-d", "--name", "test", "busybox", "sleep", "30") - out := inspectField(c, "test", "HostConfig.RestartPolicy.Name") + runSleepingContainer(c, "--name=testrunsetdefaultrestartpolicy") + out := inspectField(c, "testrunsetdefaultrestartpolicy", "HostConfig.RestartPolicy.Name") if out != "no" { c.Fatalf("Set default restart policy failed") } @@ -2826,8 +2826,8 @@ func (s *DockerSuite) TestRunContainerWithReadonlyRootfsWithAddHostFlag(c *check func (s *DockerSuite) TestRunVolumesFromRestartAfterRemoved(c *check.C) { prefix, _ := getPrefixAndSlashFromDaemonPlatform() - dockerCmd(c, "run", "-d", "--name", "voltest", "-v", prefix+"/foo", "busybox", "sleep", "60") - dockerCmd(c, "run", "-d", "--name", "restarter", "--volumes-from", "voltest", "busybox", "sleep", "60") + runSleepingContainer(c, "--name=voltest", "-v", prefix+"/foo") + runSleepingContainer(c, "--name=restarter", "--volumes-from", "voltest") // Remove the main volume container and restart the consuming container dockerCmd(c, "rm", "-f", "voltest")