From da3c6fc55363af2163b4d2613c9951bdaea24810 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sun, 2 Jun 2024 10:59:09 +0200 Subject: [PATCH] test: Run end.sh when running integration tests with mkosi --- test/integration-test-wrapper.py | 1 + test/units/end.service | 1 + test/units/end.sh | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py index 5b098a3e01f..0c9649301c4 100755 --- a/test/integration-test-wrapper.py +++ b/test/integration-test-wrapper.py @@ -71,6 +71,7 @@ def main(): [Service] StandardOutput=journal+console + ExecStart=/usr/lib/systemd/tests/testdata/units/end.sh """ ) diff --git a/test/units/end.service b/test/units/end.service index 50a68b9dd49..5455a8f33b8 100644 --- a/test/units/end.service +++ b/test/units/end.service @@ -3,6 +3,7 @@ Description=End the test After=testsuite.target OnFailure=poweroff.target +OnSuccess=poweroff.target OnFailureJobMode=replace-irreversibly [Service] diff --git a/test/units/end.sh b/test/units/end.sh index cc1d7ee11eb..a18c9473eaf 100755 --- a/test/units/end.sh +++ b/test/units/end.sh @@ -13,5 +13,4 @@ set -o pipefail (! journalctl -q -o short-monotonic --grep "[F]ailed to parse serialized line" >>/failed) (! journalctl -q -o short-monotonic --grep "[F]ailed to (de)?serialize \w+" >>/failed) -systemctl poweroff --no-block exit 0 -- 2.47.3