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-28-PERCENTJ-WANTEDBY | |
| 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-28-PERCENTJ-WANTEDBY')
| -rwxr-xr-x | test/TEST-28-PERCENTJ-WANTEDBY/test.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/test/TEST-28-PERCENTJ-WANTEDBY/test.sh b/test/TEST-28-PERCENTJ-WANTEDBY/test.sh index 1fb9825bf8..3427ba7a91 100755 --- a/test/TEST-28-PERCENTJ-WANTEDBY/test.sh +++ b/test/TEST-28-PERCENTJ-WANTEDBY/test.sh @@ -14,6 +14,7 @@ test_setup() { eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) setup_basic_environment + mask_supporting_services # Set up the services. cat >$initdir/etc/systemd/system/specifier-j-wants.service << EOF @@ -48,14 +49,8 @@ EOF setup_testsuite ) - setup_nspawn_root - # 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 + setup_nspawn_root } do_test "$@" |