mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-03 01:17:45 +03:00
Revert "tests: add test for handling of background sessions"
This reverts commit bf40417c7c
.
This commit is contained in:
parent
8da70b9d30
commit
527e0e8188
@ -8,7 +8,7 @@ TEST_DESCRIPTION="Tests for systemd-logind"
|
|||||||
. "${TEST_BASE_DIR:?}/test-functions"
|
. "${TEST_BASE_DIR:?}/test-functions"
|
||||||
|
|
||||||
test_append_files() {
|
test_append_files() {
|
||||||
image_install -o evemu-device evemu-event crond crontab
|
image_install -o evemu-device evemu-event
|
||||||
}
|
}
|
||||||
|
|
||||||
do_test "$@"
|
do_test "$@"
|
||||||
|
@ -430,50 +430,6 @@ EOF
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
teardown_cron() (
|
|
||||||
set +ex
|
|
||||||
|
|
||||||
pkill -u "$(id -u logind-test-user)"
|
|
||||||
sleep 1
|
|
||||||
pkill -KILL -u "$(id -u logind-test-user)"
|
|
||||||
pkill crond
|
|
||||||
crontab -r -u logind-test-user
|
|
||||||
|
|
||||||
return 0
|
|
||||||
)
|
|
||||||
|
|
||||||
test_no_user_instance_for_cron() {
|
|
||||||
if ! command -v crond || ! command -v crontab ; then
|
|
||||||
echo "Skipping test for background cron sessions because cron is missing."
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
trap teardown_cron RETURN
|
|
||||||
|
|
||||||
# Setup cron
|
|
||||||
crond -s -n &
|
|
||||||
# Install crontab for the test user that runs sleep every minute. But let's sleep for
|
|
||||||
# 65 seconds to make sure there is overlap between two consecutive runs, i.e. we have
|
|
||||||
# always a cron session running.
|
|
||||||
crontab -u logind-test-user - <<EOF
|
|
||||||
RANDOM_DELAY=0
|
|
||||||
* * * * * /bin/sleep 65
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Let's wait (at most one interval plus 10s to accommodate for slow machines) for at least one session
|
|
||||||
# of the test user
|
|
||||||
timeout 70 bash -c "while ! loginctl --no-legend list-sessions | grep -q logind-test-user; do sleep 1; done"
|
|
||||||
|
|
||||||
# Check that all sessions of test user have class=background and no user instance was started
|
|
||||||
# for the test user.
|
|
||||||
while read -r s _; do
|
|
||||||
assert_eq "$(loginctl --property Class --value show-session "$s")" "background"
|
|
||||||
done < <(loginctl --no-legend list-sessions | grep logind-test-user)
|
|
||||||
|
|
||||||
assert_eq "$(systemctl --property ActiveState --value show user@"$(id -u logind-test-user)".service)" "inactive"
|
|
||||||
assert_eq "$(systemctl --property SubState --value show user@"$(id -u logind-test-user)".service)" "dead"
|
|
||||||
}
|
|
||||||
|
|
||||||
test_session_properties() {
|
test_session_properties() {
|
||||||
local s
|
local s
|
||||||
|
|
||||||
@ -499,7 +455,6 @@ test_suspend_on_lid
|
|||||||
test_shutdown
|
test_shutdown
|
||||||
test_session
|
test_session
|
||||||
test_lock_idle_action
|
test_lock_idle_action
|
||||||
test_no_user_instance_for_cron
|
|
||||||
test_session_properties
|
test_session_properties
|
||||||
|
|
||||||
touch /testok
|
touch /testok
|
||||||
|
Loading…
Reference in New Issue
Block a user