From 527e0e8188221fcffb39fded2232f20ded2eaae3 Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Wed, 13 Jul 2022 16:45:54 +0200 Subject: [PATCH] Revert "tests: add test for handling of background sessions" This reverts commit bf40417c7cbe0afb185eda97ea46395b1bb74bdf. --- test/TEST-35-LOGIN/test.sh | 2 +- test/units/testsuite-35.sh | 45 -------------------------------------- 2 files changed, 1 insertion(+), 46 deletions(-) diff --git a/test/TEST-35-LOGIN/test.sh b/test/TEST-35-LOGIN/test.sh index add862c962..808f94a58f 100755 --- a/test/TEST-35-LOGIN/test.sh +++ b/test/TEST-35-LOGIN/test.sh @@ -8,7 +8,7 @@ TEST_DESCRIPTION="Tests for systemd-logind" . "${TEST_BASE_DIR:?}/test-functions" test_append_files() { - image_install -o evemu-device evemu-event crond crontab + image_install -o evemu-device evemu-event } do_test "$@" diff --git a/test/units/testsuite-35.sh b/test/units/testsuite-35.sh index 33b5fbf1ee..fa90bc6d73 100755 --- a/test/units/testsuite-35.sh +++ b/test/units/testsuite-35.sh @@ -430,50 +430,6 @@ EOF 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 - <