7 files changed, 81 insertions, 16 deletions
diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats
index 85b9bc1ca..5fc07acfb 100644
--- a/test/system/001-basic.bats
+++ b/test/system/001-basic.bats
@@ -13,6 +13,14 @@ function setup() {
 @test "podman version emits reasonable output" {
     run_podman version
 
+    # First line of podman-remote is "Client:<blank>".
+    # Just delete it (i.e. remove the first entry from the 'lines' array)
+    if is_remote; then
+        if expr "${lines[0]}" : "Client:" >/dev/null; then
+            lines=("${lines[@]:1}")
+        fi
+    fi
+
     is "${lines[0]}" "Version:[ ]\+[1-9][0-9.]\+" "Version line 1"
     is "$output" ".*Go Version: \+"               "'Go Version' in output"
     is "$output" ".*RemoteAPI Version: \+"        "API version in output"
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 c1e7c7ec4..5ef84e9b8 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -6,10 +6,8 @@
 load helpers
 
 @test "podman build - basic test" {
-    if [[ "$PODMAN" =~ -remote ]]; then
-        if [ "$(id -u)" -ne 0 ]; then
-            skip "unreliable with podman-remote and rootless; #2972"
-        fi
+    if is_remote && is_rootless; then
+        skip "unreliable with podman-remote and rootless; #2972"
     fi
 
     rand_filename=$(random_string 20)
diff --git a/test/system/200-pod-top.bats b/test/system/200-pod-top.bats
index 08f495fb1..bba1e8d14 100644
--- a/test/system/200-pod-top.bats
+++ b/test/system/200-pod-top.bats
@@ -3,7 +3,7 @@
 load helpers
 
 @test "podman pod top - containers in different PID namespaces" {
-    skip "this test is not reliable. Reenable once pod-top is fixed."
+    skip_if_remote "podman-pod does not work with podman-remote"
 
     # With infra=false, we don't get a /pause container (we also
     # don't pull k8s.gcr.io/pause )
@@ -28,9 +28,6 @@ load helpers
 
     # By default (podman pod create w/ default --infra) there should be
     # a /pause container.
-    # FIXME: sometimes there is, sometimes there isn't. If anyone ever
-    # actually figures this out, please either reenable this line or
-    # remove it entirely.
     if [ -z "$no_infra" ]; then
         is "$output" ".*0 \+1 \+0 \+[0-9. ?s]\+/pause" "there is a /pause container"
     fi
diff --git a/test/system/README.md b/test/system/README.md
index d98b1c0fe..fe6d1ed52 100644
--- a/test/system/README.md
+++ b/test/system/README.md
@@ -28,6 +28,8 @@ on failure.
 
 * `skip_if_rootless` - if rootless, skip this test with a helpful message.
 
+* `skip_if_remote` - like the above, but skip if testing `podman-remote`
+
 * `random_string` - returns a pseudorandom alphanumeric string
 
 Test files are of the form `NNN-name.bats` where NNN is a three-digit
diff --git a/test/system/helpers.bash b/test/system/helpers.bash
index fe0a25b37..3d607f4bd 100644
--- a/test/system/helpers.bash
+++ b/test/system/helpers.bash
@@ -216,26 +216,31 @@ function wait_for_ready {
 ###############################################################################
 # BEGIN miscellaneous tools
 
+# Shortcuts for common needs:
+function is_rootless() {
+    [ "$(id -u)" -ne 0 ]
+}
+
+function is_remote() {
+    [[ "$PODMAN" =~ -remote ]]
+}
+
 ######################
 #  skip_if_rootless  #  ...with an optional message
 ######################
 function skip_if_rootless() {
-    if [ "$(id -u)" -eq 0 ]; then
-        return
+    if is_rootless; then
+        skip "${1:-not applicable under rootless podman}"
     fi
-
-    skip "${1:-not applicable under rootless podman}"
 }
 
 ####################
 #  skip_if_remote  #  ...with an optional message
 ####################
 function skip_if_remote() {
-    if [[ ! "$PODMAN" =~ -remote ]]; then
-        return
+    if is_remote; then
+        skip "${1:-test does not work with podman-remote}"
     fi
-
-    skip "${1:-test does not work with podman-remote}"
 }
 
 #########################