test: add function to reduce copied setup boilerplate

[thirdparty/systemd.git] / test / TEST-28-PERCENTJ-WANTEDBY / test.sh

diff --git a/test/TEST-28-PERCENTJ-WANTEDBY/test.sh b/test/TEST-28-PERCENTJ-WANTEDBY/test.sh
index 42db3b621dd4b3de89fff3de710aedf7bfdd9095..3427ba7a91de2306308d53311b8c626159ddad99 100755 (executable)
--- a/test/TEST-28-PERCENTJ-WANTEDBY/test.sh
+++ b/test/TEST-28-PERCENTJ-WANTEDBY/test.sh
@@ -6,9 +6,7 @@ RUN_IN_UNPRIVILEGED_CONTAINER=yes
 . $TEST_BASE_DIR/test-functions
 
 test_setup() {
-    create_empty_image
-    mkdir -p $TESTDIR/root
-    mount ${LOOPDEV}p1 $TESTDIR/root
+    create_empty_image_rootdir
 
     # Create what will eventually be our root filesystem onto an overlay
     (
@@ -16,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
@@ -50,17 +49,8 @@ EOF
 
         setup_testsuite
     )
-    setup_nspawn_root
-
-        # mask some services that we do not want to run in these tests
-        ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
-        ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
-        ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
-        ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
-        ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
 
-    ddebug "umount $TESTDIR/root"
-    umount $TESTDIR/root
+    setup_nspawn_root
 }
 
 do_test "$@"