Merge pull request #9214 from rhatdan/wait

Fix invalid wait condition on kill
containers · Feb 3, 2021 · 301e54d · 301e54d
2 parents e8db5bb + d87f54f
commit 301e54d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
@@ -233,8 +233,8 @@ func KillContainer(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		if sig == 0 || syscall.Signal(sig) == syscall.SIGKILL {
-			var opts entities.WaitOptions
-			if _, err := containerEngine.ContainerWait(r.Context(), []string{name}, opts); err != nil {
+			if _, err := utils.WaitContainer(w, r); err != nil {
+
 				utils.Error(w, "Something went wrong.", http.StatusInternalServerError, err)
 				return
 			}

diff --git a/test/python/docker/test_containers.py b/test/python/docker/test_containers.py
@@ -95,6 +95,15 @@ def test_stop_container(self):
         top.reload()
         self.assertIn(top.status, ("stopped", "exited"))
 
+    def test_kill_container(self):
+        top = self.client.containers.get(TestContainers.topContainerId)
+        self.assertEqual(top.status, "running")
+
+        # Kill a running container and validate the state
+        top.kill()
+        top.reload()
+        self.assertIn(top.status, ("stopped", "exited"))
+
     def test_restart_container(self):
         # Validate the container state
         top = self.client.containers.get(TestContainers.topContainerId)