starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-27 17:56:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23540 from cpuguy83/fix_test_cleanup_mounts

Browse Source 
TestCleanupMountsAfterGracefulShutdown wait for daemon exit
Upstream-commit: 3f0dbc89b8d27238544c9a0ea9aaafd7a2731206
Component: engine
This commit is contained in:
Michael Crosby
2016-06-14 15:34:21 -07:00
committed by GitHub
parent d6790a5164 3fcf0ea4c7
commit a0e666c042
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_daemon_test.go
+2 -3
View File
@@ -1587,9 +1587,8 @@ func (s *DockerDaemonSuite) TestCleanupMountsAfterGracefulShutdown(c *check.C) {
// Send SIGINT and daemon should clean up
c.Assert(s.d.cmd.Process.Signal(os.Interrupt), check.IsNil)
// Wait a bit for the daemon to handle cleanups.
time.Sleep(3 * time.Second)
// Wait for the daemon to stop.
c.Assert(<-s.d.wait, checker.IsNil)
mountOut, err := ioutil.ReadFile("/proc/self/mountinfo")
c.Assert(err, check.IsNil, check.Commentf("Output: %s", mountOut))