summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2021-04-27 14:45:59 -0600
committerEd Santiago <santiago@redhat.com>2021-04-27 15:10:18 -0600
commitc11e9b01b3647ff753b9d81a4598872c4aef5643 (patch)
tree8afc1f291e1b1bab5748e007828a2ddc0e55cae1
parentba9c1f3f17a4f0086d9ac25fe0f211b3c75e514a (diff)
downloadpodman-c11e9b01b3647ff753b9d81a4598872c4aef5643.tar.gz
podman-c11e9b01b3647ff753b9d81a4598872c4aef5643.tar.bz2
podman-c11e9b01b3647ff753b9d81a4598872c4aef5643.zip
System tests: fix two race conditions
Basically, add 'podman wait' before 'podman rm'. See if this fixes gating tests run on ppc64le (possibly very very slow hosts) Signed-off-by: Ed Santiago <santiago@redhat.com>
-rw-r--r--test/system/030-run.bats1
-rw-r--r--test/system/500-networking.bats1
2 files changed, 2 insertions, 0 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index b2999a9e7..6e4dd32df 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -501,6 +501,7 @@ json-file | f
run_podman inspect --format '{{.OCIRuntime}}' $cid
is "$output" "$new_runtime" "podman inspect shows configured runtime"
run_podman kill $cid
+ run_podman wait $cid
run_podman rm $cid
rm -f $new_runtime
}
diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats
index 21240e521..9f8791e5d 100644
--- a/test/system/500-networking.bats
+++ b/test/system/500-networking.bats
@@ -116,6 +116,7 @@ load helpers
is "$output" ".*${teststring}.*" "test string received on container"
# Clean up
+ run_podman wait $cid
run_podman rm $cid
done
}