summaryrefslogtreecommitdiffstats
path: root/test/units/testsuite-15.sh
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-21 17:01:09 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-28 11:46:47 +0100
commit1aa0f3849118e234dfbb546b7d656b6a136aa2b1 (patch)
treef5240d22ac570f9ab5bf8ea9a62175c31d3ffc7c /test/units/testsuite-15.sh
parenttest/TEST-15: remove all created unit files (diff)
downloadsystemd-1aa0f3849118e234dfbb546b7d656b6a136aa2b1.tar.xz
systemd-1aa0f3849118e234dfbb546b7d656b6a136aa2b1.zip
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.
Diffstat (limited to '')
-rwxr-xr-xtest/units/testsuite-15.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/units/testsuite-15.sh b/test/units/testsuite-15.sh
index b09b6a1283..b872a24c20 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