mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-12 19:53:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: ensure cleanup functions return success

Browse Source 
Otherwise the return value of the last command is propagated, which may
cause spurious test failures. E.g., pkill returns 1 if no process
matched, which may be a problem in cleanup session:

cleanup_session() {
...

    pkill -u "$(id -u logind-test-user)"
    sleep 1
    pkill -KILL -u "$(id -u logind-test-user)"
}

If there are no remaining processes when the final pkill runs, it will
return 1 and therefore cleanup_session will return 1 as well.
This commit is contained in:
David Tardon 2022-07-13 11:29:20 +02:00
parent 8ce1a3033f
commit bd681a7eb0
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,8 @@ cleanup_test_user() (
sleep 1
pkill -KILL -u "$(id -u logind-test-user)"
userdel -r logind-test-user
return 0
)
setup_test_user() {
@ -83,6 +85,8 @@ teardown_suspend() (
rm -f /run/udev/rules.d/70-logindtest-lid.rules
udevadm control --reload
return 0
)
test_suspend_on_lid() {
@ -224,6 +228,8 @@ cleanup_session() (
pkill -u "$(id -u logind-test-user)"
sleep 1
pkill -KILL -u "$(id -u logind-test-user)"
return 0
)
teardown_session() (
@ -234,6 +240,8 @@ teardown_session() (
rm -f /run/udev/rules.d/70-logindtest-scsi_debug-user.rules
udevadm control --reload
rmmod scsi_debug
return 0
)
check_session() (
@ -372,6 +380,8 @@ teardown_lock_idle_action() (
rm -f /run/systemd/logind.conf.d/idle-action-lock.conf
systemctl restart systemd-logind.service
return 0
)
test_lock_idle_action() {
@ -428,6 +438,8 @@ teardown_cron() (
pkill -KILL -u "$(id -u logind-test-user)"
pkill crond
crontab -r -u logind-test-user
return 0
)
test_no_user_instance_for_cron() {