clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12248 from duglin/RemoveJobKill

Browse Source 
Remove Job from `docker kill`
This commit is contained in:
Michael Crosby
2015-04-10 10:52:18 -07:00
parent 43aca9adac 3cb751906a
commit 267bd51adb
5 changed files with 29 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration/server_test.go
+2 -2
View File
@@ -132,8 +132,8 @@ func TestRestartKillWait(t *testing.T) {
if err := job.Run(); err != nil {
t.Fatal(err)
}
job = eng.Job("kill", id)
if err := job.Run(); err != nil {
if err := runtime.ContainerKill(id, 0); err != nil {
t.Fatal(err)
}
integration/utils_test.go
+1 -1
View File
@@ -105,7 +105,7 @@ func containerWaitTimeout(eng *engine.Engine, id string, t Fataler) error {
}
func containerKill(eng *engine.Engine, id string, t Fataler) {
if err := eng.Job("kill", id).Run(); err != nil {
if err := getDaemon(eng).ContainerKill(id, 0); err != nil {
t.Fatal(err)
}
}