From 3fd09dd18a84c7e2eaba2f18aab2b9009bd75c21 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Mon, 19 Feb 2024 07:45:36 -0700
Subject: [PATCH] System tests: enable debugging for parallel-rm test

There's currently no way to inspect failures of the
parallel-remove test (#21742). Add debugging ability.

Also, clean up nasty red warnings

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 test/system/040-ps.bats    | 3 +++
 test/system/070-build.bats | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/test/system/040-ps.bats b/test/system/040-ps.bats
index 84ec7e2b72..f9fc531fa2 100644
--- a/test/system/040-ps.bats
+++ b/test/system/040-ps.bats
@@ -216,6 +216,7 @@ EOF
     is "$output" "$rand_value"
 
     run_podman pod rm -t 0 -f test
+    run_podman rmi $(pause_image)
 }
 
 @test "podman ps --format PodName" {
@@ -229,6 +230,8 @@ EOF
     is "$output" ".*$rand_value"
 
     run_podman rm -t 0 -f $cid
+    run_podman pod rm -t 0 -f $rand_value
+    run_podman rmi $(pause_image)
 }
 
 # vim: filetype=sh
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 9299e0954a..6f77feb79e 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -249,13 +249,20 @@ EOF
     local count=30
     for i in $(seq --format '%02g' 1 $count); do
         timeout --foreground -v --kill=10 60 \
-                $PODMAN build -t i$i $PODMAN_TMPDIR &>/dev/null &
+                $PODMAN build -t i$i $PODMAN_TMPDIR &> $PODMAN_TMPDIR/log.$i &
     done
 
     # Wait for all background builds to complete. Note that this succeeds
     # even if some of the individual builds fail! Our actual test is below.
     wait
 
+    # For debugging, e.g., #21742
+    for log in $PODMAN_TMPDIR/log.*;do
+        echo
+        echo $log ":"
+        cat $log
+    done
+
     # Now delete all built images. If any image wasn't built, rmi will fail
     # and test will fail.
     run_podman rmi $(seq --format 'i%02g' 1 $count)