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

2026-04-14 08:25:20 +09:00 · 2019-12-17 10:35:37 +01:00
parent 4962ed9f33
commit de0162a95a
4 changed files with 7 additions and 1 deletions
--- 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
--- 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
--- a/test/testsuite-28.units/testsuite-28-pre.service
+++ b/test/testsuite-28.units/testsuite-28-pre.service
@@ -0,0 +1,3 @@
+[Service]
+ExecStart=rm -f /failed /testok
+Type=oneshot
--- 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