summaryrefslogtreecommitdiffstats
path: root/test/TEST-08-ISSUE-2730/test.sh
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-10-08 09:10:12 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-10-08 09:10:12 +0200
commit51fa85913c4d1826414c6fa5a2e235f65425d91a (patch)
tree4efa7c9426038c38d1eba8e34d56c0619c7a6cdd /test/TEST-08-ISSUE-2730/test.sh
parenttest: drop redirection to tty in integration tests (diff)
downloadsystemd-51fa85913c4d1826414c6fa5a2e235f65425d91a.tar.xz
systemd-51fa85913c4d1826414c6fa5a2e235f65425d91a.zip
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.
Diffstat (limited to 'test/TEST-08-ISSUE-2730/test.sh')
-rwxr-xr-xtest/TEST-08-ISSUE-2730/test.sh7
1 files changed, 1 insertions, 6 deletions
diff --git a/test/TEST-08-ISSUE-2730/test.sh b/test/TEST-08-ISSUE-2730/test.sh
index 8643842e81..a9e6ffa79d 100755
--- a/test/TEST-08-ISSUE-2730/test.sh
+++ b/test/TEST-08-ISSUE-2730/test.sh
@@ -64,12 +64,7 @@ EOF
mkdir -p $initdir/etc/systemd/system/local-fs.target.wants
ln -s /etc/systemd/system/-.mount $initdir/etc/systemd/system/local-fs.target.wants/-.mount
- # 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
+ mask_supporting_services
}
do_test "$@"