diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-02 15:37:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-02 15:37:47 +0200 |
| commit | 3cc9ab8992833ddf952df479ffb239c61845fa2e (patch) | |
| tree | 8949453ea7f225f891640bfa53d3e74b12972cdd /test | |
| parent | 5370c53c9c22627385e9bc765dbd1fcfedc09694 (diff) | |
| parent | 6eee9ab080ead50587f5a4272353a9b21cfd55b3 (diff) | |
| download | podman-3cc9ab8992833ddf952df479ffb239c61845fa2e.tar.gz podman-3cc9ab8992833ddf952df479ffb239c61845fa2e.tar.bz2 podman-3cc9ab8992833ddf952df479ffb239c61845fa2e.zip | |
Merge pull request #3695 from edsantiago/bats_hang_fix
System tests: resolve hang in rawhide rootless
Diffstat (limited to 'test')
| -rw-r--r-- | test/system/helpers.bash | 4 |
1 files changed, 3 insertions, 1 deletions
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" |