From 92e0efc5d022d1e92cb5b6826016771db77406bc Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Mon, 27 Mar 2023 10:34:10 -0600
Subject: [PATCH] system tests: fix racey sdnotify test

Race introduced in #16709, which changed 'top' to 'true', so
there was only a narrow window in which '.State.ConmonPod'
would be valid. Remove the race.

Fixes: #17882

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 test/system/260-sdnotify.bats | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/system/260-sdnotify.bats b/test/system/260-sdnotify.bats
index 65701762a1..3cf3f64bfd 100644
--- a/test/system/260-sdnotify.bats
+++ b/test/system/260-sdnotify.bats
@@ -203,7 +203,9 @@ spec:
   restartPolicy: "Never"
   containers:
   - command:
-    - true
+    - /bin/sh
+    - -c
+    - 'while :; do if test -e /tearsinrain; then exit 0; fi; sleep 1; done'
     image: $IMAGE
     name: test
     resources: {}
@@ -225,7 +227,8 @@ EOF
     run_podman container inspect $service_container --format "{{.State.ConmonPid}}"
     main_pid="$output"
 
-    # Will run until all containers have stopped.
+    # Tell pod to finish, then wait for all containers to stop
+    run_podman exec test_pod-test touch /tearsinrain
     run_podman container wait $service_container test_pod-test
 
     # Make sure the containers have the correct policy.