From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 21 Mar 2020 16:01:09 +0000 (+0100)
Subject: test/TEST-15: call daemon-reload in two more places
X-Git-Tag: v246-rc1~682^2~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1aa0f3849118e234dfbb546b7d656b6a136aa2b1;p=thirdparty%2Fsystemd.git

test/TEST-15: call daemon-reload in two more places

Sometimes the test would fail there, nondeterministically. I'm not sure why,
but relying on PID1 not caching the file is clearly very brittle. Let's instead
call daemon-reload.
---

diff --git a/test/units/testsuite-15.sh b/test/units/testsuite-15.sh
index b09b6a12837..b872a24c200 100755
--- a/test/units/testsuite-15.sh
+++ b/test/units/testsuite-15.sh
@@ -116,6 +116,7 @@ test_basic_dropins () {
 [Service]
 ExecCondition=/bin/echo %n
 EOF
+    systemctl daemon-reload
     check_ok test15-a ExecCondition "/bin/echo test15-a"
     check_ok test15-b ExecCondition "/bin/echo test15-b"
     rm -rf /usr/lib/systemd/system/service.d
@@ -138,6 +139,7 @@ test_hierarchical_dropins () {
 [Service]
 ExecCondition=/bin/echo $dropin
         " > /usr/lib/systemd/system/$dropin/override.conf
+        systemctl daemon-reload
         check_ok a-b-c ExecCondition "/bin/echo $dropin"
     done
     for dropin in service.d a-.service.d a-b-.service.d a-b-c.service.d; do