summaryrefslogtreecommitdiffstats
path: root/test/TEST-03-JOBS
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-03-JOBS
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-03-JOBS')
-rwxr-xr-xtest/TEST-03-JOBS/test.sh9
1 files changed, 1 insertions, 8 deletions
diff --git a/test/TEST-03-JOBS/test.sh b/test/TEST-03-JOBS/test.sh
index 3359ee6840..50b7bce3ed 100755
--- a/test/TEST-03-JOBS/test.sh
+++ b/test/TEST-03-JOBS/test.sh
@@ -14,14 +14,7 @@ test_setup() {
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
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
# setup the testsuite service
cat >$initdir/etc/systemd/system/testsuite.service <<EOF