From 51fa85913c4d1826414c6fa5a2e235f65425d91a Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Tue, 8 Oct 2019 09:10:12 +0200 Subject: test: add function to reduce copied setup boilerplate Many tests were also masking systemd-machined.service. But machined should only start when activated, so having it not masked shouldn't be noticable. TEST-25-IMPORT needs it. --- test/TEST-30-ONCLOCKCHANGE/test.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'test/TEST-30-ONCLOCKCHANGE/test.sh') diff --git a/test/TEST-30-ONCLOCKCHANGE/test.sh b/test/TEST-30-ONCLOCKCHANGE/test.sh index 67e074af4c..8976e95308 100755 --- a/test/TEST-30-ONCLOCKCHANGE/test.sh +++ b/test/TEST-30-ONCLOCKCHANGE/test.sh @@ -16,14 +16,7 @@ test_setup() { inst_any /usr/share/zoneinfo/Europe/Berlin setup_basic_environment - - # mask some services that we do not want to run in these tests - ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service - ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service - ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service - ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket - ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service - ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service + mask_supporting_services # extend the watchdog mkdir -p $initdir/etc/systemd/system/systemd-timedated.service.d -- cgit v1.2.3