Merge pull request #17944 from edsantiago/sdnotify_race

system tests: fix racey sdnotify test
This commit is contained in:
OpenShift Merge Robot
2023-03-27 16:38:18 -04:00
committed by GitHub

View File

@ -203,7 +203,9 @@ spec:
restartPolicy: "Never" restartPolicy: "Never"
containers: containers:
- command: - command:
- true - /bin/sh
- -c
- 'while :; do if test -e /tearsinrain; then exit 0; fi; sleep 1; done'
image: $IMAGE image: $IMAGE
name: test name: test
resources: {} resources: {}
@ -225,7 +227,8 @@ EOF
run_podman container inspect $service_container --format "{{.State.ConmonPid}}" run_podman container inspect $service_container --format "{{.State.ConmonPid}}"
main_pid="$output" 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 run_podman container wait $service_container test_pod-test
# Make sure the containers have the correct policy. # Make sure the containers have the correct policy.