test: merge TEST-28-PERCENTJ-WANTEDBY into TEST-23-UNIT-FILE

7 files changed, 18 insertions, 33 deletions

diff --git a/test/TEST-28-PERCENTJ-WANTEDBY/Makefile b/test/TEST-28-PERCENTJ-WANTEDBY/Makefile
deleted file mode 120000
index e9f93b1104..0000000000
--- a/test/TEST-28-PERCENTJ-WANTEDBY/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../TEST-01-BASIC/Makefile
\ No newline at end of file
diff --git a/test/TEST-28-PERCENTJ-WANTEDBY/test.sh b/test/TEST-28-PERCENTJ-WANTEDBY/test.sh
deleted file mode 100755
index ae935fa789..0000000000
--- a/test/TEST-28-PERCENTJ-WANTEDBY/test.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -e
-
-TEST_DESCRIPTION="Ensure %j Wants directives work"
-RUN_IN_UNPRIVILEGED_CONTAINER=yes
-
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
-
-do_test "$@"
diff --git a/test/testsuite-28.units/specifier-j-depends-wants.service b/test/testsuite-23.units/testsuite-23-specifier-j-depends-wants.service
index c39a8ba911..c45edd9b54 100644
--- a/test/testsuite-28.units/specifier-j-depends-wants.service
+++ b/test/testsuite-23.units/testsuite-23-specifier-j-depends-wants.service
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
 Description=Dependent service for percent-j specifier
-After=testsuite-28-pre.service
 
 [Service]
 Type=oneshot
diff --git a/test/testsuite-28.units/specifier-j-wants.service b/test/testsuite-23.units/testsuite-23-specifier-j-wants.service
index 6067ba09ac..9abb257df4 100644
--- a/test/testsuite-28.units/specifier-j-wants.service
+++ b/test/testsuite-23.units/testsuite-23-specifier-j-wants.service
@@ -1,11 +1,10 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
 Description=Wants with percent-j specifier
-Wants=specifier-j-depends-%j.service
-After=specifier-j-depends-%j.service
-After=testsuite-28-pre.service
+Wants=testsuite-23-specifier-j-depends-%j.service
+After=testsuite-23-specifier-j-depends-%j.service
 
 [Service]
 Type=oneshot
 ExecStart=test -f /tmp/test-specifier-j-%j
-ExecStart=sh -c 'echo OK >/testok'
+ExecStart=touch /tmp/tetsuite-23-specifier-j-done
diff --git a/test/testsuite-28.units/testsuite-28-pre.service b/test/testsuite-28.units/testsuite-28-pre.service
deleted file mode 100644
index 0d77247cfd..0000000000
--- a/test/testsuite-28.units/testsuite-28-pre.service
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Service]
-ExecStart=rm -f /failed /testok
-Type=oneshot
diff --git a/test/units/testsuite-23.percentj-wantedby.sh b/test/units/testsuite-23.percentj-wantedby.sh
new file mode 100755
index 0000000000..e9ffaba682
--- /dev/null
+++ b/test/units/testsuite-23.percentj-wantedby.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+set -eux
+set -o pipefail
+
+# Ensure %j Wants directives work
+systemd-run --wait \
+            --property="Type=oneshot" \
+            --property="Wants=testsuite-23-specifier-j-wants.service" \
+            --property="After=testsuite-23-specifier-j-wants.service" \
+            true
+
+test -f /tmp/tetsuite-23-specifier-j-done
diff --git a/test/units/testsuite-28.service b/test/units/testsuite-28.service
deleted file mode 100644
index 222de00c32..0000000000
--- a/test/units/testsuite-28.service
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-28-PERCENTJ-WANTEDBY
-# Testsuite: Ensure %j Wants directives work
-Wants=specifier-j-wants.service
-After=specifier-j-wants.service
-Requires=testsuite-28-pre.service
-After=testsuite-28-pre.service
-
-[Service]
-ExecStart=true
-Type=oneshot