Browse code

RunSleepingContainer consistency

Signed-off-by: John Howard <jhoward@microsoft.com>

John Howard authored on 2016/05/04 02:52:09
Showing 1 changed files
... ...
@@ -2710,8 +2710,8 @@ func (s *DockerSuite) TestRunAllowPortRangeThroughPublish(c *check.C) {
2710 2710
 }
2711 2711
 
2712 2712
 func (s *DockerSuite) TestRunSetDefaultRestartPolicy(c *check.C) {
2713
-	dockerCmd(c, "run", "-d", "--name", "test", "busybox", "sleep", "30")
2714
-	out := inspectField(c, "test", "HostConfig.RestartPolicy.Name")
2713
+	runSleepingContainer(c, "--name=testrunsetdefaultrestartpolicy")
2714
+	out := inspectField(c, "testrunsetdefaultrestartpolicy", "HostConfig.RestartPolicy.Name")
2715 2715
 	if out != "no" {
2716 2716
 		c.Fatalf("Set default restart policy failed")
2717 2717
 	}
... ...
@@ -2826,8 +2826,8 @@ func (s *DockerSuite) TestRunContainerWithReadonlyRootfsWithAddHostFlag(c *check
2826 2826
 
2827 2827
 func (s *DockerSuite) TestRunVolumesFromRestartAfterRemoved(c *check.C) {
2828 2828
 	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
2829
-	dockerCmd(c, "run", "-d", "--name", "voltest", "-v", prefix+"/foo", "busybox", "sleep", "60")
2830
-	dockerCmd(c, "run", "-d", "--name", "restarter", "--volumes-from", "voltest", "busybox", "sleep", "60")
2829
+	runSleepingContainer(c, "--name=voltest", "-v", prefix+"/foo")
2830
+	runSleepingContainer(c, "--name=restarter", "--volumes-from", "voltest")
2831 2831
 
2832 2832
 	// Remove the main volume container and restart the consuming container
2833 2833
 	dockerCmd(c, "rm", "-f", "voltest")