test/TEST-28: avoid race in handling of /testok

diff --git a/test/testsuite-28.units/specifier-j-depends-wants.service b/test/testsuite-28.units/specifier-j-depends-wants.service
index 1db4d855b9bbb43187dc32d8ca5719febab2786e..f9c6abb4937972fb0a3c0038a6b70bca31187abb 100644 (file)
--- a/test/testsuite-28.units/specifier-j-depends-wants.service
+++ b/test/testsuite-28.units/specifier-j-depends-wants.service
@@ -1,5 +1,6 @@
 [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-28.units/specifier-j-wants.service
index 10c35906bb8fc65886e3d8d008cda5c2a21a20fb..facf5577be10ba31d8e5887c6b8eb1b648bf6880 100644 (file)
--- a/test/testsuite-28.units/specifier-j-wants.service
+++ b/test/testsuite-28.units/specifier-j-wants.service
@@ -2,6 +2,7 @@
 Description=Wants with percent-j specifier
 Wants=specifier-j-depends-%j.service
 After=specifier-j-depends-%j.service
+After=testsuite-28-pre.service
 
 [Service]
 Type=oneshot

diff --git a/test/testsuite-28.units/testsuite-28-pre.service b/test/testsuite-28.units/testsuite-28-pre.service
new file mode 100644 (file)
index 0000000..2b8ef98
--- /dev/null
+++ b/test/testsuite-28.units/testsuite-28-pre.service
@@ -0,0 +1,3 @@
+[Service]
+ExecStart=rm -f /failed /testok
+Type=oneshot

diff --git a/test/units/testsuite-28.service b/test/units/testsuite-28.service
index 6a41114493131e9439337c6a2345695bdc9aa8f5..7ea863001189ff041b5496d4bf208afe252c2c63 100644 (file)
--- a/test/units/testsuite-28.service
+++ b/test/units/testsuite-28.service
@@ -3,8 +3,9 @@ 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]
-ExecStartPre=rm -f /failed /testok
 ExecStart=true
 Type=oneshot