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

Merge pull request #7374 from cpuguy83/revert_rm_f_deprecation

Browse Source 
Revert --stop/--kill and use SIGKILL instead
This commit is contained in:
Michael Crosby
2014-08-07 16:47:25 -07:00
parent 5d9cfde0df 95f86da641
commit 414ccee23a
9 changed files with 18 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_rm_test.go
+3 -25
View File
@@ -57,40 +57,18 @@ func TestRemoveRunningContainer(t *testing.T) {
logDone("rm - running container")
}
func TestStopAndRemoveRunningContainer(t *testing.T) {
func TestForceRemoveRunningContainer(t *testing.T) {
createRunningContainer(t, "foo")
// Stop then remove with -s
cmd := exec.Command(dockerBinary, "rm", "-s", "foo")
cmd := exec.Command(dockerBinary, "rm", "-f", "foo")
if _, err := runCommand(cmd); err != nil {
t.Fatal(err)
}
deleteAllContainers()
logDone("rm - running container with --stop=true")
}
func TestKillAndRemoveRunningContainer(t *testing.T) {
createRunningContainer(t, "foo")
// Kill then remove with -k
cmd := exec.Command(dockerBinary, "rm", "-k", "foo")
if _, err := runCommand(cmd); err != nil {
t.Fatal(err)
}
deleteAllContainers()
logDone("rm - running container with --kill=true")
}
func TestRemoveContainerWithStopAndKill(t *testing.T) {
cmd := exec.Command(dockerBinary, "rm", "-sk", "foo")
if _, err := runCommand(cmd); err == nil {
t.Fatalf("Expected error: can't use stop and kill simulteanously")
}
logDone("rm - with --stop=true and --kill=true")
logDone("rm - running container with --force=true")
}
func TestContainerOrphaning(t *testing.T) {