InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix unless-stopped unexpected behavior

Browse Source 
fix https://github.com/moby/moby/issues/35304.

Signed-off-by: dengguangxing <dengguangxing@huawei.com>
This commit is contained in:
Deng Guangxing
2017-11-01 14:15:02 +08:00
committed by Brian Goff
parent d440fea460
commit 8e293be4ba
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
integration-cli/docker_cli_daemon_test.go
View File

@@ -124,6 +124,9 @@ func (s *DockerDaemonSuite) TestDaemonRestartUnlessStopped(c *check.C) {
out, err = s.d.Cmd("run", "-d", "--name", "top2", "--restart", "unless-stopped", "busybox:latest", "top")
c.Assert(err, check.IsNil, check.Commentf("run top2: %v", out))
out, err = s.d.Cmd("run", "-d", "--name", "exit", "--restart", "unless-stopped", "busybox:latest", "false")
c.Assert(err, check.IsNil, check.Commentf("run exit: %v", out))
testRun := func(m map[string]bool, prefix string) {
var format string
for name, shouldRun := range m {
@@ -139,7 +142,10 @@ func (s *DockerDaemonSuite) TestDaemonRestartUnlessStopped(c *check.C) {
}
// both running
testRun(map[string]bool{"top1": true, "top2": true}, "")
testRun(map[string]bool{"top1": true, "top2": true, "exit": true}, "")
out, err = s.d.Cmd("stop", "exit")
c.Assert(err, check.IsNil, check.Commentf(out))
out, err = s.d.Cmd("stop", "top1")
c.Assert(err, check.IsNil, check.Commentf("%s", out))
@@ -148,20 +154,23 @@ func (s *DockerDaemonSuite) TestDaemonRestartUnlessStopped(c *check.C) {
c.Assert(err, check.IsNil, check.Commentf("%s", out))
// both stopped
testRun(map[string]bool{"top1": false, "top2": false}, "")
testRun(map[string]bool{"top1": false, "top2": false, "exit": false}, "")
s.d.Restart(c)
// restart=always running
testRun(map[string]bool{"top1": true, "top2": false}, "After daemon restart: ")
testRun(map[string]bool{"top1": true, "top2": false, "exit": false}, "After daemon restart: ")
out, err = s.d.Cmd("start", "top2")
c.Assert(err, check.IsNil, check.Commentf("start top2: %v", out))
out, err = s.d.Cmd("start", "exit")
c.Assert(err, check.IsNil, check.Commentf("start exit: %v", out))
s.d.Restart(c)
// both running
testRun(map[string]bool{"top1": true, "top2": true}, "After second daemon restart: ")
testRun(map[string]bool{"top1": true, "top2": true, "exit": true}, "After second daemon restart: ")
}