From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 10 Jan 2025 13:51:24 +0000 (+0100)
Subject: test: Move StateDirectory= directive into dropin
X-Git-Tag: v258-rc1~1640^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f17ec0ed419627a686ee6e719ac7f55cf082ada;p=thirdparty%2Fsystemd.git

test: Move StateDirectory= directive into dropin

The integration-test-setup calls require StateDirectory= but some
tests override the test unit used which then won't have StateDirectory=
so let's move StateDirectory= into the dropin as well to avoid this
issue.
---

diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index 94904cfbc4c..610c34c9034 100755
--- a/test/integration-test-wrapper.py
+++ b/test/integration-test-wrapper.py
@@ -470,6 +470,7 @@ def main() -> None:
             [Service]
             ExecStartPre=/usr/lib/systemd/tests/testdata/integration-test-setup.sh setup
             ExecStopPost=/usr/lib/systemd/tests/testdata/integration-test-setup.sh finalize
+            StateDirectory=%N
             """
         )
 
diff --git a/test/test.service.in b/test/test.service.in
index 75f703698f6..790c513da43 100644
--- a/test/test.service.in
+++ b/test/test.service.in
@@ -10,4 +10,3 @@ ExecStartPre=rm -f /failed /testok
 ExecStart=@command@
 Type=oneshot
 MemoryAccounting=@memory-accounting@
-StateDirectory=%N