From dfa633ca6a17685d4a82198498e90ffbdd54dc87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 10 Dec 2019 09:13:20 +0100
Subject: [PATCH] test: move TEST-26-SETENV setup to static files

Also run mask_supporting_services() here.
---
 test/TEST-26-SETENV/test.sh                      | 16 ++--------------
 test/units/testsuite-26.service                  |  6 ++++++
 .../testsuite.sh => units/testsuite-26.sh}       |  0
 3 files changed, 8 insertions(+), 14 deletions(-)
 create mode 100644 test/units/testsuite-26.service
 rename test/{TEST-26-SETENV/testsuite.sh => units/testsuite-26.sh} (100%)

diff --git a/test/TEST-26-SETENV/test.sh b/test/TEST-26-SETENV/test.sh
index ee0f562277b..7b71fcda3af 100755
--- a/test/TEST-26-SETENV/test.sh
+++ b/test/TEST-26-SETENV/test.sh
@@ -12,21 +12,9 @@ test_setup() {
         eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
 
         setup_basic_environment
-
-        # setup the testsuite service
-        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
-[Unit]
-Description=Testsuite service
-
-[Service]
-ExecStart=/bin/bash -x /testsuite.sh
-Type=oneshot
-EOF
-        cp testsuite.sh $initdir/
-
-        setup_testsuite
+        mask_supporting_services
     )
     setup_nspawn_root
 }
 
-do_test "$@"
+do_test "$@" 26
diff --git a/test/units/testsuite-26.service b/test/units/testsuite-26.service
new file mode 100644
index 00000000000..ac1b2faa3f9
--- /dev/null
+++ b/test/units/testsuite-26.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=TEST-26-SETENV
+
+[Service]
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+Type=oneshot
diff --git a/test/TEST-26-SETENV/testsuite.sh b/test/units/testsuite-26.sh
similarity index 100%
rename from test/TEST-26-SETENV/testsuite.sh
rename to test/units/testsuite-26.sh