summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-12-18 11:16:09 -0800
committerGitHub <noreply@github.com>2018-12-18 11:16:09 -0800
commit51d80ed01b95dc9f96ec7fae48eab4453e9475d7 (patch)
treef893a49d6dbd6c9302a224eccd052efcadfbe44f /contrib
parent3ec11ac77c54acbe5d1b66918434e2d4db3ca3cf (diff)
parent8e62d0120ee4c25047decc8311453c98a835d178 (diff)
downloadpodman-51d80ed01b95dc9f96ec7fae48eab4453e9475d7.tar.gz
podman-51d80ed01b95dc9f96ec7fae48eab4453e9475d7.tar.bz2
podman-51d80ed01b95dc9f96ec7fae48eab4453e9475d7.zip
Merge pull request #2022 from baude/flakeflake
all flakes must die
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/python/podman/test/test_runner.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/python/podman/test/test_runner.sh b/contrib/python/podman/test/test_runner.sh
index bf097e2b2..651b2e74f 100755
--- a/contrib/python/podman/test/test_runner.sh
+++ b/contrib/python/podman/test/test_runner.sh
@@ -41,6 +41,7 @@ export TMPDIR=`mktemp -d /tmp/podman.XXXXXXXXXX`
trap "cleanup $TMPDIR" EXIT
function umount {
+ set +xeuo pipefail
# xargs -r always ran once, so write any mount points to file first
mount |awk "/$1/"' { print $3 }' >${TMPDIR}/mounts
if [[ -s ${TMPDIR}/mounts ]]; then