diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-10-08 09:10:12 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-10-08 09:10:12 +0200 |
commit | 51fa85913c4d1826414c6fa5a2e235f65425d91a (patch) | |
tree | 4efa7c9426038c38d1eba8e34d56c0619c7a6cdd /test/TEST-09-ISSUE-2691 | |
parent | test: drop redirection to tty in integration tests (diff) | |
download | systemd-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-09-ISSUE-2691')
-rwxr-xr-x | test/TEST-09-ISSUE-2691/test.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/test/TEST-09-ISSUE-2691/test.sh b/test/TEST-09-ISSUE-2691/test.sh index 1a8b900672..ca3e69d2ca 100755 --- a/test/TEST-09-ISSUE-2691/test.sh +++ b/test/TEST-09-ISSUE-2691/test.sh @@ -15,6 +15,7 @@ test_setup() { eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) setup_basic_environment + mask_supporting_services # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<'EOF' @@ -31,13 +32,6 @@ EOF setup_testsuite ) - - # 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 } do_test "$@" |