shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-26 03:22:00 +03:00
Code

test: wait for user service or slice to be finished

Browse Source 
Hopefully fixes #24040.
This commit is contained in:
Yu Watanabe 2022-07-22 15:45:24 +09:00 committed by Frantisek Sumsal
parent aafcc8601b
commit 8015e25870
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/units/testsuite-35.sh
View File

@ -221,15 +221,32 @@ test_shutdown() {
cleanup_session() (
set +ex
systemctl stop getty@tty2.service
rm -rf /run/systemd/system/getty@tty2.service.d
systemctl daemon-reload
local uid
uid=$(id -u logind-test-user)
loginctl disable-linger logind-test-user
pkill -u "$(id -u logind-test-user)"
systemctl stop getty@tty2.service
pkill -u "$uid"
sleep 1
pkill -KILL -u "$(id -u logind-test-user)"
pkill -KILL -u "$uid"
if ! timeout 30 bash -c "while systemctl is-active --quiet user@${uid}.service; do sleep 1; done"; then
echo "WARNING: user@${uid}.service is still active, ignoring."
fi
if ! timeout 30 bash -c "while systemctl is-active --quiet user-runtime-dir@${uid}.service; do sleep 1; done"; then
echo "WARNING: user-runtime-dir@${uid}.service is still active, ignoring."
fi
if ! timeout 30 bash -c "while systemctl is-active --quiet user-${uid}.slice; do sleep 1; done"; then
echo "WARNING: user-${uid}.slice is still active, ignoring."
fi
rm -rf /run/systemd/system/getty@tty2.service.d
systemctl daemon-reload
return 0
)