summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2025-01-10 14:51:24 +0100
committerDaan De Meyer <daan.j.demeyer@gmail.com>2025-01-10 16:14:01 +0100
commit1f17ec0ed419627a686ee6e719ac7f55cf082ada (patch)
tree0ab92a0f1f0e8ff76d8af92a07c457143bc3452d /test
parenttest: Don't register machines with machined unless we're in interactive mode (diff)
downloadsystemd-1f17ec0ed419627a686ee6e719ac7f55cf082ada.tar.xz
systemd-1f17ec0ed419627a686ee6e719ac7f55cf082ada.zip
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.
Diffstat (limited to 'test')
-rwxr-xr-xtest/integration-test-wrapper.py1
-rw-r--r--test/test.service.in1
2 files changed, 1 insertions, 1 deletions
diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index 94904cfbc4..610c34c903 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 75f703698f..790c513da4 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