diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-28 06:22:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-28 06:22:45 -0400 |
commit | 99e5a76f09645362eb781050f10f1ad19db312a7 (patch) | |
tree | dcf5ef753cec24013140c482f82e6ea610c42a06 /test/system | |
parent | 5dc9faf624d4f8a386b1faffe1ffa046ba0b62dd (diff) | |
parent | c11e9b01b3647ff753b9d81a4598872c4aef5643 (diff) | |
download | podman-99e5a76f09645362eb781050f10f1ad19db312a7.tar.gz podman-99e5a76f09645362eb781050f10f1ad19db312a7.tar.bz2 podman-99e5a76f09645362eb781050f10f1ad19db312a7.zip |
Merge pull request #10157 from edsantiago/bats
System tests: fix two race conditions
Diffstat (limited to 'test/system')
-rw-r--r-- | test/system/030-run.bats | 1 | ||||
-rw-r--r-- | test/system/500-networking.bats | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats index c007a1557..2b83fa56e 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 } |