diff options
author | Ed Santiago <santiago@redhat.com> | 2020-12-15 14:40:16 -0700 |
---|---|---|
committer | Ed Santiago <santiago@redhat.com> | 2021-02-23 06:58:54 -0700 |
commit | 79eaadd3fb480255fa0b9fbfc5517425b7c1730b (patch) | |
tree | a596b0a5cdc7c3e60aa060e9fceaaee6095ec7d0 /test/system | |
parent | a6e7d19c463a55a7d3bf6e47faec1906f3f32380 (diff) | |
download | podman-79eaadd3fb480255fa0b9fbfc5517425b7c1730b.tar.gz podman-79eaadd3fb480255fa0b9fbfc5517425b7c1730b.tar.bz2 podman-79eaadd3fb480255fa0b9fbfc5517425b7c1730b.zip |
podman upgrade tests
Initial validation of using podman-in-podman to create an
old-podman root, then use new-podman to play with the
containers created therein.
Signed-off-by: Ed Santiago <santiago@redhat.com>
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 0572c6866..4a7823852 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -149,7 +149,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" |