3 files changed, 69 insertions, 2 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index cefff0e2c..9e609b434 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -43,4 +43,17 @@ echo $rand        |   0 | $rand
     is "$output" "" "unwanted /sys/kernel in 'mount' output (with --net=host)"
 }
 
+# 'run --rm' goes through different code paths and may lose exit status.
+# See https://github.com/containers/libpod/issues/3795
+@test "podman run --rm" {
+    skip_if_remote "podman-remote does not handle exit codes"
+
+    run_podman 0 run --rm $IMAGE /bin/true
+    run_podman 1 run --rm $IMAGE /bin/false
+
+    # Believe it or not, 'sh -c' resulted in different behavior
+    run_podman 0 run --rm $IMAGE sh -c /bin/true
+    run_podman 1 run --rm $IMAGE sh -c /bin/false
+}
+
 # vim: filetype=sh
diff --git a/test/system/055-rm.bats b/test/system/055-rm.bats
new file mode 100644
index 000000000..c13c8c52e
--- /dev/null
+++ b/test/system/055-rm.bats
@@ -0,0 +1,42 @@
+#!/usr/bin/env bats   -*- bats -*-
+#
+# tests for podman rm
+#
+
+load helpers
+
+@test "podman rm" {
+    rand=$(random_string 30)
+    run_podman run --name $rand $IMAGE /bin/true
+
+    # Don't care about output, just check exit status (it should exist)
+    run_podman 0 inspect $rand
+
+    # container should be in output of 'ps -a'
+    run_podman ps -a
+    is "$output" ".* $IMAGE .*/true .* $rand" "Container present in 'ps -a'"
+
+    # Remove container; now 'inspect' should fail
+    run_podman rm $rand
+    run_podman 125 inspect $rand
+}
+
+# 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'
+# or 'podman run --rm' (see also 030-run.bats). The test below is a bit
+# kludgy: what we care about is the exit status of the killed container,
+# not 'podman rm', but BATS has no provision (that I know of) for forking,
+# so what we do is start the 'rm' beforehand and monitor the exit status
+# of the 'sleep' container.
+#
+# See https://github.com/containers/libpod/issues/3795
+@test "podman rm -f" {
+    skip_if_remote "podman-remote does not handle exit codes"
+
+    rand=$(random_string 30)
+    ( sleep 3; run_podman rm -f $rand ) &
+    run_podman 137 run --name $rand $IMAGE sleep 30
+}
+
+# vim: filetype=sh
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 5ef84e9b8..a9d2ed1b7 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -22,12 +22,24 @@ RUN apk add nginx
 RUN echo $rand_content > /$rand_filename
 EOF
 
-    run_podman build -t build_test --format=docker $tmpdir
+    # The 'apk' command can take a long time to fetch files; bump timeout
+    PODMAN_TIMEOUT=240 run_podman build -t build_test --format=docker $tmpdir
     is "$output" ".*STEP 4: COMMIT" "COMMIT seen in log"
 
     run_podman run --rm build_test cat /$rand_filename
     is "$output"   "$rand_content"   "reading generated file in image"
 
-    run_podman rmi build_test
+    run_podman rmi -f build_test
 }
+
+function teardown() {
+    # A timeout or other error in 'build' can leave behind stale images
+    # that podman can't even see and which will cascade into subsequent
+    # test failures. Try a last-ditch force-rm in cleanup, ignoring errors.
+    run_podman '?' rm -a -f
+    run_podman '?' rmi -f build_test
+
+    basic_teardown
+}
+
 # vim: filetype=sh