From 79eaadd3fb480255fa0b9fbfc5517425b7c1730b Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 15 Dec 2020 14:40:16 -0700 Subject: 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 --- test/system/helpers.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/system') 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" -- cgit v1.2.3-54-g00ecf