From de0162a95aef39fbfb0e0883433ba654d86627fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 17 Dec 2019 10:35:37 +0100
Subject: [PATCH] test/TEST-28: avoid race in handling of /testok

---
 test/testsuite-28.units/specifier-j-depends-wants.service | 1 +
 test/testsuite-28.units/specifier-j-wants.service         | 1 +
 test/testsuite-28.units/testsuite-28-pre.service          | 3 +++
 test/units/testsuite-28.service                           | 3 ++-
 4 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 test/testsuite-28.units/testsuite-28-pre.service

diff --git a/test/testsuite-28.units/specifier-j-depends-wants.service b/test/testsuite-28.units/specifier-j-depends-wants.service
index 1db4d855b9..f9c6abb493 100644
--- 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 10c35906bb..facf5577be 100644
--- 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
index 0000000000..2b8ef98911
--- /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 6a41114493..7ea8630011 100644
--- 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