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.

(cherry picked from commit 1f17ec0ed419627a686ee6e719ac7f55cf082ada)

diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index 94904cfbc4c0566ec0144cf2e193b34ecfe5225b..610c34c9034257d49fd1577122ecaa2f2d2568f5 100755 (executable)
--- 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 75f703698f6875ba3a2006a165866da673f84644..790c513da4338e7073277523eca50af9d22a42e4 100644 (file)
--- 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