Merge pull request containers#17944 from edsantiago/sdnotify_race

system tests: fix racey sdnotify test
rhatdan · Mar 27, 2023 · ec56f8d · ec56f8d
2 parents c09bd20 + 92e0efc
commit ec56f8d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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.