From c11e9b01b3647ff753b9d81a4598872c4aef5643 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Tue, 27 Apr 2021 14:45:59 -0600
Subject: [PATCH] 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>
---
 test/system/030-run.bats        | 1 +
 test/system/500-networking.bats | 1 +
 2 files changed, 2 insertions(+)

diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index b2999a9e7f..6e4dd32df4 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 21240e5210..9f8791e5dd 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
 }