test: optionally allow to disable user service manager, and disable it on TEST-64

The test triggers many uevents, and running both system and user service
managers make the test slow.

diff --git a/test/TEST-64-UDEV-STORAGE/meson.build b/test/TEST-64-UDEV-STORAGE/meson.build
index d54c2623860a4efde06460e6f3001ebff558353d..15981ce35f1679b334977dc3f617fa8d0e0abf2b 100644 (file)
--- a/test/TEST-64-UDEV-STORAGE/meson.build
+++ b/test/TEST-64-UDEV-STORAGE/meson.build
@@ -4,7 +4,11 @@ name = fs.name(meson.current_source_dir())
 unit = configure_file(
         input : files('../test.service.in'),
         output : '@0@.service'.format(name),
-        configuration : integration_test_template['configuration'],
+        # Disable user service manager by default for performance.
+        configuration : integration_test_template['configuration'] + {
+              'wants' : '',
+              'after' : '',
+        },
 )
 
 foreach testcase : [

diff --git a/test/meson.build b/test/meson.build
index 92edd079b44cbb0b438ccb773a1390d872690820..c767b4c64a9248ed377da69563b4fbb6619be03a 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -286,8 +286,8 @@ integration_test_template = {
         'configuration' : {
                 'memory-accounting' : 'no',
                 'command' : testdata_dir / 'units/%N.sh',
-                'wants' : '',
-                'after' : '',
+                'wants' : 'multi-user.target user@4711.service',
+                'after' : 'user@4711.service',
         },
         'cmdline' : [],
         'credentials' : [],

diff --git a/test/test.service.in b/test/test.service.in
index 57f2afbce1a0b9d7bfabc7c12b1d1d7cd65e983a..790c513da4338e7073277523eca50af9d22a42e4 100644 (file)
--- a/test/test.service.in
+++ b/test/test.service.in
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
 Description=%N
-Wants=basic.target network.target multi-user.target user@4711.service @wants@
-After=basic.target network.target user@4711.service @after@
+Wants=basic.target network.target @wants@
+After=basic.target network.target @after@
 Before=getty-pre.target
 
 [Service]