diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-30 08:35:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 08:35:07 -0400 |
| commit | d8bdbf5b66c860a73f5d4e301535c0ee40d8d719 (patch) | |
| tree | ee5e4c6705632064406f49147d2e5fb51947d300 /test/system/040-ps.bats | |
| parent | f0ae84f5120f7ec8d2fc16c6ae9e52725b5d4958 (diff) | |
| parent | 855746cc9258b85d390d68cd3c61ca0588dd0f8f (diff) | |
| download | podman-d8bdbf5b66c860a73f5d4e301535c0ee40d8d719.tar.gz podman-d8bdbf5b66c860a73f5d4e301535c0ee40d8d719.tar.bz2 podman-d8bdbf5b66c860a73f5d4e301535c0ee40d8d719.zip | |
Merge pull request #11792 from mheon/340_final
Backports + release notes for v3.4.0 final
Diffstat (limited to 'test/system/040-ps.bats')
| -rw-r--r-- | test/system/040-ps.bats | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/system/040-ps.bats b/test/system/040-ps.bats index 182d75547..bb2971574 100644 --- a/test/system/040-ps.bats +++ b/test/system/040-ps.bats @@ -90,10 +90,18 @@ load helpers is "${#lines[@]}" "1" "setup check: no storage containers at start of test" # Force a buildah timeout; this leaves a buildah container behind + local t0=$SECONDS PODMAN_TIMEOUT=5 run_podman 124 build -t thiswillneverexist - <<EOF FROM $IMAGE RUN sleep 30 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)" + fi run_podman ps -a is "${#lines[@]}" "1" "podman ps -a does not see buildah container" |