p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22478 from Microsoft/jjh/clirunsleepingcontainer

Browse Source 
runSleepingContainer consistency
Upstream-commit: 3b0a166b10e63f8f3f20dd4f4a5250993a9025d3
Component: engine
This commit is contained in:
Alexander Morozov
2016-05-03 13:11:27 -07:00
parent 958cc5f73b bbb9555a0a
commit 1328fc105e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/integration-cli/docker_cli_run_test.go
View File

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