1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

tests: aux kills lvmdbusd more agressively

It's not exactly trivial to kill 'frozen' lvmdbusd.
So skip the test testing interruption and also add killall use.
This commit is contained in:
Zdenek Kabelac 2023-10-18 01:48:50 +02:00
parent beae68890c
commit 2e56778038

View File

@ -317,6 +317,7 @@ prepare_lvmdbusd() {
unset LVM_LOG_FILE_EPOCH
unset LVM_LOG_FILE_MAX_LINES
unset LVM_EXPECTED_EXIT_STATUS
export LVM_DBUSD_TEST_SKIP_SIGNAL=1
"$daemon" $lvmdbusdebug > debug.log_LVMDBUSD_out 2>&1 &
local pid=$!
@ -495,6 +496,7 @@ kill_sleep_kill_() {
if test -s "$pidfile" ; then
pid=$(< "$pidfile")
rm -f "$pidfile"
test "$pidfile" = "LOCAL_LVMDBUSD" && killall -9 lvmdbusd || true
kill -TERM "$pid" 2>/dev/null || return 0
for i in {0..10} ; do
ps "$pid" >/dev/null || return 0