Add podman rm --depend

This option causes Podman to not only remove the specified containers
but all of the containers that depend on the specified
containers.
Fixes: https://github.com/containers/podman/issues/10360

Also ran codespell on the code

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

7 files changed, 23 insertions, 11 deletions

diff --git a/test/apiv2/12-imagesMore.at b/test/apiv2/12-imagesMore.at
index 3a5d5c096..96eba1db5 100644
--- a/test/apiv2/12-imagesMore.at
+++ b/test/apiv2/12-imagesMore.at
@@ -53,7 +53,7 @@ t GET libpod/images/$IMAGE/json 200 \
   .RepoTags[-1]=$IMAGE
 
 # Remove the registry container
-t DELETE libpod/containers/registry?force=true 204
+t DELETE libpod/containers/registry?force=true 200
 
 # Remove images
 t DELETE libpod/images/$IMAGE 200 \
diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at
index 554a905d4..936597f72 100644
--- a/test/apiv2/20-containers.at
+++ b/test/apiv2/20-containers.at
@@ -85,7 +85,7 @@ else
     fi
 fi
 
-t DELETE libpod/containers/$cid 204
+t DELETE libpod/containers/$cid 200 .[0].Id=$cid
 
 # Issue #6799: it should be possible to start a container, even w/o args.
 t POST libpod/containers/create?name=test_noargs Image=${IMAGE} 201 \
@@ -100,7 +100,7 @@ t GET    libpod/containers/${cid}/json 200 \
   .State.Status~\\\(exited\\\|stopped\\\) \
   .State.Running=false \
   .State.ExitCode=0
-t DELETE libpod/containers/$cid 204
+t DELETE libpod/containers/$cid 200 .[0].Id=$cid
 
 CNAME=myfoo
 podman run -d --name $CNAME $IMAGE top
@@ -190,8 +190,8 @@ t GET containers/myctr/json 200 \
 t DELETE images/localhost/newrepo:latest?force=true 200
 t DELETE images/localhost/newrepo:v1?force=true 200
 t DELETE images/localhost/newrepo:v2?force=true 200
-t DELETE libpod/containers/$cid?force=true 204
-t DELETE libpod/containers/myctr 204
+t DELETE libpod/containers/$cid?force=true 200 .[0].Id=$cid
+t DELETE libpod/containers/myctr 200
 t DELETE libpod/containers/bogus 404
 
 
diff --git a/test/apiv2/22-stop.at b/test/apiv2/22-stop.at
index 91bc9937d..bde534b72 100644
--- a/test/apiv2/22-stop.at
+++ b/test/apiv2/22-stop.at
@@ -11,7 +11,7 @@ podman run -dt --name mytop $IMAGE top &>/dev/null
 t GET  libpod/containers/mytop/json 200 .State.Status=running
 t POST libpod/containers/mytop/stop 204
 t GET  libpod/containers/mytop/json 200 .State.Status~\\\(exited\\\|stopped\\\)
-t DELETE libpod/containers/mytop    204
+t DELETE libpod/containers/mytop    200
 
 # stop, by ID
 # Remember that podman() hides all output; we need to get our CID via inspect
@@ -21,4 +21,4 @@ t GET  libpod/containers/mytop/json 200 .State.Status=running
 cid=$(jq -r .Id <<<"$output")
 t POST libpod/containers/$cid/stop  204
 t GET  libpod/containers/mytop/json 200 .State.Status~\\\(exited\\\|stopped\\\)
-t DELETE libpod/containers/mytop    204
+t DELETE libpod/containers/mytop    200
diff --git a/test/apiv2/25-containersMore.at b/test/apiv2/25-containersMore.at
index 0a049d869..c9fda8c6f 100644
--- a/test/apiv2/25-containersMore.at
+++ b/test/apiv2/25-containersMore.at
@@ -51,7 +51,7 @@ like "$output" ".*merged" "Check container mount"
 # Unmount the container
 t POST libpod/containers/foo/unmount 204
 
-t DELETE libpod/containers/foo?force=true 204
+t DELETE libpod/containers/foo?force=true 200
 
 podman run $IMAGE true
 
@@ -79,7 +79,7 @@ like "$output" ".*metadata:.*" "Check generated kube yaml(service=true) - metada
 like "$output" ".*spec:.*" "Check generated kube yaml(service=true) - spec"
 like "$output" ".*kind:\\sService.*" "Check generated kube yaml(service=true) - kind: Service"
 
-t DELETE libpod/containers/$cid 204
+t DELETE libpod/containers/$cid 200 .[0].Id=$cid
 
 # Create 3 stopped containers to test containers prune
 podman run $IMAGE true
diff --git a/test/apiv2/python/rest_api/test_v2_0_0_container.py b/test/apiv2/python/rest_api/test_v2_0_0_container.py
index 101044bbb..1b4597cf8 100644
--- a/test/apiv2/python/rest_api/test_v2_0_0_container.py
+++ b/test/apiv2/python/rest_api/test_v2_0_0_container.py
@@ -99,7 +99,7 @@ class ContainerTestCase(APITestCase):
 
     def test_delete(self):
         r = requests.delete(self.uri(self.resolve_container("/containers/{}?force=true")))
-        self.assertEqual(r.status_code, 204, r.text)
+        self.assertEqual(r.status_code, 200, r.text)
 
     def test_stop(self):
         r = requests.post(self.uri(self.resolve_container("/containers/{}/start")))
diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats
index 23489c1b5..9b0a71285 100644
--- a/test/system/001-basic.bats
+++ b/test/system/001-basic.bats
@@ -41,7 +41,7 @@ function setup() {
     # This one must fail
     run_podman 125 --context=swarm version
     is "$output" \
-       "Error: Podman does not support swarm, the only --context value allowed is \"default\"" \
+       "Error: podman does not support swarm, the only --context value allowed is \"default\"" \
        "--context=default or fail"
 }
 
diff --git a/test/system/055-rm.bats b/test/system/055-rm.bats
index 7fe81c084..69663fafa 100644
--- a/test/system/055-rm.bats
+++ b/test/system/055-rm.bats
@@ -58,6 +58,18 @@ load helpers
     run_podman rm -af
 }
 
+@test "podman rm --depend" {
+    run_podman create $IMAGE
+    dependCid=$output
+    run_podman create --net=container:$dependCid $IMAGE
+    cid=$output
+    run_podman 125 rm $dependCid
+    is "$output" "Error: container $dependCid has dependent containers which must be removed before it:.*" "Fail to remove because of dependencies"
+    run_podman rm --depend $dependCid
+    is "$output" ".*$cid" "Container should have been removed"
+    is "$output" ".*$dependCid" "Depend container should have been removed"
+}
+
 # I'm sorry! This test takes 13 seconds. There's not much I can do about it,
 # please know that I think it's justified: podman 1.5.0 had a strange bug
 # in with exit status was not preserved on some code paths with 'rm -f'