diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-26 13:19:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-26 13:19:25 +0100 |
| commit | 397aae32b9ae219eda190cde65b18e4361427932 (patch) | |
| tree | c2a488d448e0c2fd3e52cda6325dfde8796c55f9 /test/system | |
| parent | 05410e81efec2ef2398f740b81610fbad73b7bf2 (diff) | |
| parent | 79eaadd3fb480255fa0b9fbfc5517425b7c1730b (diff) | |
| download | podman-397aae32b9ae219eda190cde65b18e4361427932.tar.gz podman-397aae32b9ae219eda190cde65b18e4361427932.tar.bz2 podman-397aae32b9ae219eda190cde65b18e4361427932.zip | |
Merge pull request #8749 from edsantiago/upgrade_test
podman upgrade tests
Diffstat (limited to 'test/system')
| -rw-r--r-- | test/system/helpers.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/system/helpers.bash b/test/system/helpers.bash index b8624ce64..38e317709 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -154,7 +154,7 @@ function run_podman() { echo "$_LOG_PROMPT $PODMAN $*" # BATS hangs if a subprocess remains and keeps FD 3 open; this happens # if podman crashes unexpectedly without cleaning up subprocesses. - run timeout --foreground -v --kill=10 $PODMAN_TIMEOUT $PODMAN "$@" 3>/dev/null + run timeout --foreground -v --kill=10 $PODMAN_TIMEOUT $PODMAN $_PODMAN_TEST_OPTS "$@" 3>/dev/null # without "quotes", multiple lines are glommed together into one if [ -n "$output" ]; then echo "$output" |