clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-07 06:22:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:docker/docker into kill

Browse Source 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
This commit is contained in:
Dan Walsh
2015-05-27 16:37:32 -04:00
parent 66121d1b45 f5d3311839
commit 35a7f0c59e
10 changed files with 145 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_kill_test.go
+2 -2
View File
@@ -42,11 +42,11 @@ func (s *DockerSuite) TestKillofStoppedContainer(c *check.C) {
stopCmd := exec.Command(dockerBinary, "stop", cleanedContainerID)
out, _, err = runCommandWithOutput(stopCmd)
c.Assert(err, check.IsNil, check.Commentf("failed to stop container: %s, %v", out, err))
c.Assert(err, check.IsNil)
killCmd := exec.Command(dockerBinary, "kill", "-s", "30", cleanedContainerID)
_, _, err = runCommandWithOutput(killCmd)
c.Assert(err, check.Not(check.IsNil), check.Commentf("Kill succeeded on a stopped container"))
c.Assert(err, check.Not(check.IsNil), check.Commentf("Container %s is not running", cleanedContainerID))
}
func (s *DockerSuite) TestKillDifferentUserContainer(c *check.C) {