diff options
Diffstat (limited to 'test/system')
| -rw-r--r-- | test/system/005-info.bats | 2 | ||||
| -rw-r--r-- | test/system/helpers.bash | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/system/005-info.bats b/test/system/005-info.bats index 0068e35a9..7fccc75af 100644 --- a/test/system/005-info.bats +++ b/test/system/005-info.bats @@ -33,7 +33,7 @@ RunRoot: run_podman info --format=json expr_nvr="[a-z0-9-]\\\+-[a-z0-9.]\\\+-[a-z0-9]\\\+\." - expr_path="/[a-z0-9\\\/.]\\\+\\\$" + expr_path="/[a-z0-9\\\-\\\/.]\\\+\\\$" tests=" host.BuildahVersion | [0-9.] diff --git a/test/system/helpers.bash b/test/system/helpers.bash index 1db80f111..fe0a25b37 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -133,7 +133,9 @@ function run_podman() { # stdout is only emitted upon error; this echo is to help a debugger echo "\$ $PODMAN $*" - run timeout --foreground -v --kill=10 $PODMAN_TIMEOUT $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 # without "quotes", multiple lines are glommed together into one if [ -n "$output" ]; then echo "$output" |