|
@@ -2710,8 +2710,8 @@ func (s *DockerSuite) TestRunAllowPortRangeThroughPublish(c *check.C) {
|
|
}
|
|
}
|
|
|
|
|
|
func (s *DockerSuite) TestRunSetDefaultRestartPolicy(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" {
|
|
if out != "no" {
|
|
c.Fatalf("Set default restart policy failed")
|
|
c.Fatalf("Set default restart policy failed")
|
|
}
|
|
}
|
|
@@ -2826,8 +2826,8 @@ func (s *DockerSuite) TestRunContainerWithReadonlyRootfsWithAddHostFlag(c *check
|
|
|
|
|
|
func (s *DockerSuite) TestRunVolumesFromRestartAfterRemoved(c *check.C) {
|
|
func (s *DockerSuite) TestRunVolumesFromRestartAfterRemoved(c *check.C) {
|
|
prefix, _ := getPrefixAndSlashFromDaemonPlatform()
|
|
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
|
|
// Remove the main volume container and restart the consuming container
|
|
dockerCmd(c, "rm", "-f", "voltest")
|
|
dockerCmd(c, "rm", "-f", "voltest")
|