opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 03:52:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9697 from edsantiago/fedora_gating_test_hang

Browse Source 
sdnotify tests: try real hard to kill socat processes
This commit is contained in:
OpenShift Merge Robot
2021-03-12 13:34:27 +00:00
committed by GitHub
parent 81737b3773 660a72993c
commit 5b22ddd08e
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/system/260-sdnotify.bats
View File

@ -42,14 +42,22 @@ function _start_socat() {
_SOCAT_LOG="$PODMAN_TMPDIR/socat.log" _SOCAT_LOG="$PODMAN_TMPDIR/socat.log"
rm -f $_SOCAT_LOG rm -f $_SOCAT_LOG
socat unix-recvfrom:"$NOTIFY_SOCKET",fork \ # Execute in subshell so we can close fd3 (which BATS uses).
system:"(cat;echo) >> $_SOCAT_LOG" & # This is a superstitious ritual to try to avoid leaving processes behind,
# and thus prevent CI hangs.
(exec socat unix-recvfrom:"$NOTIFY_SOCKET",fork \
system:"(cat;echo) >> $_SOCAT_LOG" 3>&-) &
_SOCAT_PID=$! _SOCAT_PID=$!
} }
# Stop the socat background process and clean up logs # Stop the socat background process and clean up logs
function _stop_socat() { function _stop_socat() {
if [[ -n "$_SOCAT_PID" ]]; then if [[ -n "$_SOCAT_PID" ]]; then
# Kill all child processes, then the process itself.
# This is a superstitious incantation to avoid leaving processes behind.
# The '|| true' is because only f35 leaves behind socat processes;
# f33 (and perhaps others?) behave nicely. ARGH!
pkill -P $_SOCAT_PID || true
kill $_SOCAT_PID kill $_SOCAT_PID
fi fi
_SOCAT_PID= _SOCAT_PID=
@ -57,6 +65,7 @@ function _stop_socat() {
if [[ -n "$_SOCAT_LOG" ]]; then if [[ -n "$_SOCAT_LOG" ]]; then
rm -f $_SOCAT_LOG rm -f $_SOCAT_LOG
fi fi
_SOCAT_LOG=
} }
# Check that MAINPID=xxxxx points to a running conmon process # Check that MAINPID=xxxxx points to a running conmon process