test: add function to reduce copied setup boilerplate

[thirdparty/systemd.git] / test / TEST-18-FAILUREACTION / test.sh

diff --git a/test/TEST-18-FAILUREACTION/test.sh b/test/TEST-18-FAILUREACTION/test.sh
index 1ef43a4e7b2f475c4c3d5f83d59b1896eee770ee..e9f6ee7afe5fd624df1eb4e1dc430559b92cddef 100755 (executable)
--- a/test/TEST-18-FAILUREACTION/test.sh
+++ b/test/TEST-18-FAILUREACTION/test.sh
@@ -3,7 +3,7 @@ set -e
 TEST_DESCRIPTION="FailureAction= operation"
 
 . $TEST_BASE_DIR/test-functions
-QEMU_TIMEOUT=180
+QEMU_TIMEOUT=600
 
 test_setup() {
     create_empty_image_rootdir
@@ -13,6 +13,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
@@ -22,21 +23,13 @@ Description=Testsuite service
 [Service]
 ExecStart=/bin/bash -x /testsuite.sh
 Type=oneshot
-StandardOutput=tty
-StandardError=tty
 EOF
         cp testsuite.sh $initdir/
 
         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
+    setup_nspawn_root
 }
 
 do_test "$@"