summaryrefslogtreecommitdiff
path: root/test/system
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-21 07:21:49 -0400
committerGitHub <noreply@github.com>2020-10-21 07:21:49 -0400
commit9d9c58ba64a59fc24d6807f495559ac2ec86b6e8 (patch)
tree58ca4bec0f9494658989eab3150b9b106be6756a /test/system
parentd5073af6b24239fc94bc6bb184f9df6a979887c6 (diff)
parentf5b3dc976c315976788bfb8b75bd0b8a40509324 (diff)
downloadpodman-9d9c58ba64a59fc24d6807f495559ac2ec86b6e8.tar.gz
podman-9d9c58ba64a59fc24d6807f495559ac2ec86b6e8.tar.bz2
podman-9d9c58ba64a59fc24d6807f495559ac2ec86b6e8.zip
Merge pull request #8065 from edsantiago/flake_tweaks
Tests: Fix common flakes, and improve apiv2 test log
Diffstat (limited to 'test/system')
-rw-r--r--test/system/260-sdnotify.bats2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/system/260-sdnotify.bats b/test/system/260-sdnotify.bats
index 2ddeda96a..c99ba4fa6 100644
--- a/test/system/260-sdnotify.bats
+++ b/test/system/260-sdnotify.bats
@@ -107,6 +107,7 @@ function _assert_mainpid_is_conmon() {
# Done. Stop container, clean up.
run_podman exec $cid touch /stop
+ run_podman wait $cid
run_podman rm $cid
_stop_socat
}
@@ -142,6 +143,7 @@ function _assert_mainpid_is_conmon() {
# Done. Stop container, clean up.
run_podman exec $cid touch /stop
+ run_podman wait $cid
run_podman rm $cid
run_podman rmi $_FEDORA
_stop_socat