summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-04-11 10:37:54 -0400
committerGitHub <noreply@github.com>2022-04-11 10:37:54 -0400
commit4a53689c56d31388a24000bda61a80b0dcb015f7 (patch)
tree99bd34d837d1d84e427b034956d08b857c3815c4
parent86616317bc31c5a2890bd3cc8aec18c59ba2a257 (diff)
parent615099ddb978af6ed8c521a565c038d80f721855 (diff)
downloadpodman-4a53689c56d31388a24000bda61a80b0dcb015f7.tar.gz
podman-4a53689c56d31388a24000bda61a80b0dcb015f7.tar.bz2
podman-4a53689c56d31388a24000bda61a80b0dcb015f7.zip
Merge pull request #13822 from edsantiago/buildah_3544_fixed
System tests: reenable ps --external test
-rw-r--r--test/system/040-ps.bats4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/system/040-ps.bats b/test/system/040-ps.bats
index 8d0a405d2..6fc0b9b6e 100644
--- a/test/system/040-ps.bats
+++ b/test/system/040-ps.bats
@@ -99,9 +99,7 @@ EOF
local t1=$SECONDS
local delta_t=$((t1 - t0))
if [[ $delta_t -gt 10 ]]; then
- # FIXME FIXME FIXME: when buildah issue 3544 gets fixed and vendored,
- # change 'echo' to 'die'
- echo "podman build did not get killed within 10 seconds (actual time: $delta_t seconds)"
+ die "podman build did not get killed within 10 seconds (actual time: $delta_t seconds)"
fi
run_podman ps -a