From 674123543057f3179ffb98aafff6bd14abbc6562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 24 Mar 2022 13:32:41 +0100
Subject: [PATCH 1/2] TEST-68: get rid of unnecessary descriptions

The name of the unit already says all, no need to duplicate this.
And the comments can easily get out of date, as they did.
---
 test/units/testsuite-68.sh | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/test/units/testsuite-68.sh b/test/units/testsuite-68.sh
index 3072a94575..3e3208eb85 100755
--- a/test/units/testsuite-68.sh
+++ b/test/units/testsuite-68.sh
@@ -25,10 +25,8 @@ wait_on_state_or_fail () {
 
 systemd-analyze log-level debug
 
-# Trigger testservice-failure-exit-handler-68.service
 cat >/run/systemd/system/testservice-failure-68.service <<EOF
 [Unit]
-Description=TEST-68-PROPAGATE-EXIT-STATUS with OnFailure= trigger
 OnFailure=testservice-failure-exit-handler-68.service
 
 [Service]
@@ -37,17 +35,14 @@ EOF
 
 cat >/run/systemd/system/testservice-failure-68-template.service <<EOF
 [Unit]
-Description=TEST-68-PROPAGATE-EXIT-STATUS with OnFailure= trigger (template)
 OnFailure=testservice-failure-exit-handler-68-template@%n.service
 
 [Service]
 ExecStart=sh -c "exit 1"
 EOF
 
-# Trigger testservice-success-exit-handler-68.service
 cat >/run/systemd/system/testservice-success-68.service <<EOF
 [Unit]
-Description=TEST-68-PROPAGATE-EXIT-STATUS with OnSuccess= trigger
 OnSuccess=testservice-success-exit-handler-68.service
 
 [Service]
@@ -56,7 +51,6 @@ EOF
 
 cat >/run/systemd/system/testservice-success-68-template.service <<EOF
 [Unit]
-Description=TEST-68-PROPAGATE-EXIT-STATUS with OnSuccess= trigger (template)
 OnSuccess=testservice-success-exit-handler-68-template@%n.service
 
 [Service]
@@ -102,11 +96,7 @@ exit 0
 EOF
 chmod +x /tmp/check_on_success.sh
 
-# Handle testservice-failure-exit-handler-68.service exiting with success.
 cat >/run/systemd/system/testservice-success-exit-handler-68.service <<EOF
-[Unit]
-Description=TEST-68-PROPAGATE-EXIT-STATUS handle service exiting in success
-
 [Service]
 ExecStartPre=/tmp/check_on_success.sh
 ExecStart=/tmp/check_on_success.sh
@@ -114,9 +104,6 @@ EOF
 
 # Template version.
 cat >/run/systemd/system/testservice-success-exit-handler-68-template@.service <<EOF
-[Unit]
-Description=TEST-68-PROPAGATE-EXIT-STATUS handle service exiting in success (template)
-
 [Service]
 ExecStartPre=echo "triggered by %i"
 ExecStartPre=/tmp/check_on_success.sh
@@ -163,11 +150,7 @@ EOF
 chmod +x /tmp/check_on_failure.sh
 
 
-# Handle testservice-failure-exit-handler-68.service exiting with failure.
 cat >/run/systemd/system/testservice-failure-exit-handler-68.service <<EOF
-[Unit]
-Description=TEST-68-PROPAGATE-EXIT-STATUS handle service exiting in failure
-
 [Service]
 # repeat the check to make sure that values are set correctly on repeated invocations
 Type=oneshot
@@ -180,9 +163,6 @@ EOF
 
 # Template version.
 cat >/run/systemd/system/testservice-failure-exit-handler-68-template@.service <<EOF
-[Unit]
-Description=TEST-68-PROPAGATE-EXIT-STATUS handle service exiting in failure (template)
-
 [Service]
 Type=oneshot
 ExecStartPre=echo "triggered by %i"

From 74fbb24f64da7c0362e447c4966590fded4f35b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 24 Mar 2022 13:45:03 +0100
Subject: [PATCH 2/2] TEST-68: instead of calling daemon-reload, just use
 different cleanup units

On a very slow machine, things are executed out-of-order, and something
pins the previously-exited unit. Instead of fighting with this with daemon-reload,
let's just use a different cleanup unit.

Hopefully fixes #22755.
---
 test/units/testsuite-68.sh | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/test/units/testsuite-68.sh b/test/units/testsuite-68.sh
index 3e3208eb85..fefb03035e 100755
--- a/test/units/testsuite-68.sh
+++ b/test/units/testsuite-68.sh
@@ -102,6 +102,9 @@ ExecStartPre=/tmp/check_on_success.sh
 ExecStart=/tmp/check_on_success.sh
 EOF
 
+cp /run/systemd/system/testservice-success-exit-handler-68.service \
+   /run/systemd/system/testservice-transient-success-exit-handler-68.service
+
 # Template version.
 cat >/run/systemd/system/testservice-success-exit-handler-68-template@.service <<EOF
 [Service]
@@ -161,6 +164,9 @@ ExecStart=/tmp/check_on_failure.sh
 ExecStartPost=test -z '$MONITOR_SERVICE_RESULT'
 EOF
 
+cp /run/systemd/system/testservice-failure-exit-handler-68.service \
+   /run/systemd/system/testservice-transient-failure-exit-handler-68.service
+
 # Template version.
 cat >/run/systemd/system/testservice-failure-exit-handler-68-template@.service <<EOF
 [Service]
@@ -183,23 +189,19 @@ wait_on_state_or_fail "testservice-failure-exit-handler-68.service" "inactive" "
 systemctl start testservice-success-68.service
 wait_on_state_or_fail "testservice-success-exit-handler-68.service" "inactive" "10"
 
-# Let's get rid of the failed units so the tests below don't fail, and daemon-reload
-# to force garbace collection of the units.
-systemctl reset-failed
-systemctl daemon-reload
-
 # Test some transient units since these exit very quickly.
 : "-------III--------------------------------------------------"
-systemd-run --unit=testservice-transient-success-68 --property=OnSuccess=testservice-success-exit-handler-68.service sh -c "exit 0"
+systemd-run --unit=testservice-transient-success-68 \
+            --property=OnSuccess=testservice-transient-success-exit-handler-68.service \
+            sh -c "exit 0"
 wait_on_state_or_fail "testservice-success-exit-handler-68.service" "inactive" "10"
 
 : "-------IIII-------------------------------------------------"
-systemd-run --unit=testservice-transient-failure-68 --property=OnFailure=testservice-failure-exit-handler-68.service sh -c "exit 1"
+systemd-run --unit=testservice-transient-failure-68 \
+            --property=OnFailure=testservice-transient-failure-exit-handler-68.service \
+            sh -c "exit 1"
 wait_on_state_or_fail "testservice-failure-exit-handler-68.service" "inactive" "10"
 
-systemctl reset-failed
-systemctl daemon-reload
-
 # Test template handlers too
 : "-------V---------------------------------------------------"
 systemctl start testservice-success-68-template.service