diff options
Diffstat (limited to 'test/units/testsuite-07.sh')
| -rwxr-xr-x | test/units/testsuite-07.sh | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/test/units/testsuite-07.sh b/test/units/testsuite-07.sh index 95ebe3876f..58d278e1f1 100755 --- a/test/units/testsuite-07.sh +++ b/test/units/testsuite-07.sh @@ -3,37 +3,16 @@ set -eux set -o pipefail -: >/failed - -cat >/lib/systemd/system/my.service <<EOF -[Service] -Type=oneshot -ExecStartPre=sh -c 'test "\$TRIGGER_UNIT" = my.timer' -ExecStartPre=sh -c 'test -n "\$TRIGGER_TIMER_REALTIME_USEC"' -ExecStartPre=sh -c 'test -n "\$TRIGGER_TIMER_MONOTONIC_USEC"' -ExecStart=/bin/echo Timer runs me -EOF - -cat >/lib/systemd/system/my.timer <<EOF -[Timer] -OnBootSec=10s -OnUnitInactiveSec=1h -EOF +# shellcheck source=test/units/test-control.sh +. "$(dirname "$0")"/test-control.sh -systemctl unmask my.timer - -systemctl start my.timer - -mkdir -p /etc/systemd/system/my.timer.d/ -cat >/etc/systemd/system/my.timer.d/override.conf <<EOF -[Timer] -OnBootSec=10s -OnUnitInactiveSec=1h -EOF +: >/failed -systemctl daemon-reload +# Issue: https://github.com/systemd/systemd/issues/2730 +# See TEST-07-PID1/test.sh for the first "half" of the test +mountpoint /issue2730 -systemctl mask my.timer +run_subtests touch /testok rm /failed |