diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-04 14:58:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-04 14:58:35 +0200 |
commit | 6aed1076a21bc913210efd1f6ad7377dfd85a9f2 (patch) | |
tree | 3c5e6fe3267f360704ce5b10237ce884702b16c0 /test/system/050-stop.bats | |
parent | 7eca5571dc9d39590bc0127f15257921dea30c55 (diff) | |
parent | a4fcf09b7ab5daa30b37705702ba2c2e30e8f9c5 (diff) | |
download | podman-6aed1076a21bc913210efd1f6ad7377dfd85a9f2.tar.gz podman-6aed1076a21bc913210efd1f6ad7377dfd85a9f2.tar.bz2 podman-6aed1076a21bc913210efd1f6ad7377dfd85a9f2.zip |
Merge pull request #7111 from edsantiago/reenable_remote_system_tests
Reenable remote system tests
Diffstat (limited to 'test/system/050-stop.bats')
-rw-r--r-- | test/system/050-stop.bats | 7 |
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. |