diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-16 00:43:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 00:43:03 +0000 |
| commit | 8333a9ee90078dd8cf1194f1df59bae70709bdf1 (patch) | |
| tree | 3caaa819643d0a844dfa9ae2268242501066dc43 /test/system/helpers.bash | |
| parent | 66e979a892df7dc820e6ce7ada0e3a34619c172f (diff) | |
| parent | 1345d0358b741093eae139d06fdd78d379070fa0 (diff) | |
| download | podman-8333a9ee90078dd8cf1194f1df59bae70709bdf1.tar.gz podman-8333a9ee90078dd8cf1194f1df59bae70709bdf1.tar.bz2 podman-8333a9ee90078dd8cf1194f1df59bae70709bdf1.zip | |
Merge pull request #8720 from edsantiago/bats
system tests: the catch-up game
Diffstat (limited to 'test/system/helpers.bash')
| -rw-r--r-- | test/system/helpers.bash | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/system/helpers.bash b/test/system/helpers.bash index f782de080..a4b89ec99 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -168,8 +168,11 @@ function run_podman() { if [ "$status" -eq 124 ]; then if expr "$output" : ".*timeout: sending" >/dev/null; then - echo "*** TIMED OUT ***" - false + # It's possible for a subtest to _want_ a timeout + if [[ "$expected_rc" != "124" ]]; then + echo "*** TIMED OUT ***" + false + fi fi fi |