summaryrefslogtreecommitdiff
path: root/test/system/050-stop.bats
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2020-07-28 08:36:52 -0600
committerEd Santiago <santiago@redhat.com>2020-08-03 09:36:36 -0600
commita4fcf09b7ab5daa30b37705702ba2c2e30e8f9c5 (patch)
treeae2f8fc696262c4a0c8dc3398c65c1d7b9f49be9 /test/system/050-stop.bats
parent2e3928ee1740c0eb2564ea6bb3004ad5b698ff8f (diff)
downloadpodman-a4fcf09b7ab5daa30b37705702ba2c2e30e8f9c5.tar.gz
podman-a4fcf09b7ab5daa30b37705702ba2c2e30e8f9c5.tar.bz2
podman-a4fcf09b7ab5daa30b37705702ba2c2e30e8f9c5.zip
Reenable remote system tests
podman-remote is in better shape now. Let's see what needs to be done to reenable remote system tests. - logs test: skip multilog, it doesn't work remote - diff test: use -l only when local, not with remote - many other tests: skip_if_remote, with 'FIXME: pending #xxxx' where xxxx is a filed issue. Unrelated: added new helper to skip_if_remote and _if_rootless, where we check if the source message includes "remote"/"rootless" and insert it if missing. This is a minor usability enhancement to make it easier to understand at-a-glance why a skip triggers. Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/system/050-stop.bats')
-rw-r--r--test/system/050-stop.bats7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/system/050-stop.bats b/test/system/050-stop.bats
index 093606ece..f604ea2e2 100644
--- a/test/system/050-stop.bats
+++ b/test/system/050-stop.bats
@@ -12,9 +12,12 @@ load helpers
run_podman stop $cid
t1=$SECONDS
- # Confirm that container is stopped
+ # Confirm that container is stopped. Podman-remote unfortunately
+ # cannot tell the difference between "stopped" and "exited", and
+ # spits them out interchangeably, so we need to recognize either.
run_podman inspect --format '{{.State.Status}} {{.State.ExitCode}}' $cid
- is "$output" "exited \+137" "Status and exit code of stopped container"
+ is "$output" "\\(stopped\|exited\\) \+137" \
+ "Status and exit code of stopped container"
# The initial SIGTERM is ignored, so this operation should take
# exactly 10 seconds. Give it some leeway.