]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test/TEST-15: call daemon-reload in two more places
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 21 Mar 2020 16:01:09 +0000 (17:01 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 28 Mar 2020 10:46:47 +0000 (11:46 +0100)
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.

test/units/testsuite-15.sh

index b09b6a12837858e04f5f30b847cf97908eac3b4b..b872a24c200c99ca661feffb1382545917e0be1c 100755 (executable)
@@ -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