From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 26 Apr 2023 09:05:40 +0000 (+0200)
Subject: test: tell dfuzzer to skip Reexecute()
X-Git-Tag: v254-rc1~629
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=914f280d0c0f1555ff94d5490dc4f264af7f331f;p=thirdparty%2Fsystemd.git

test: tell dfuzzer to skip Reexecute()

As described in systemd/systemd#27204 reexecuting the daemon while
running in a systemd-run "session" causes the session end prematurely.
Let's skip the Reexecute() method in dfuzzer and trigger it manually
until the issue is resolved.
---

diff --git a/test/units/testsuite-21.sh b/test/units/testsuite-21.sh
index d931e631678..36f647ca5f6 100755
--- a/test/units/testsuite-21.sh
+++ b/test/units/testsuite-21.sh
@@ -7,6 +7,7 @@ set -o pipefail
 # on the fly by one of the fuzzers
 systemctl list-jobs | grep -F 'end.service' && SHUTDOWN_AT_EXIT=1 || SHUTDOWN_AT_EXIT=0
 
+# shellcheck disable=SC2317
 at_exit() {
     set +e
     # We have to call the end.service/poweroff explicitly even if it's specified on
@@ -24,6 +25,10 @@ trap at_exit EXIT
 
 systemctl log-level info
 
+# FIXME: systemd-run doesn't play well with daemon-reexec
+# See: https://github.com/systemd/systemd/issues/27204
+sed -i '/\[org.freedesktop.systemd1\]/aorg.freedesktop.systemd1.Manager:Reexecute FIXME' /etc/dfuzzer.conf
+
 # TODO
 #   * check for possibly newly introduced buses?
 BUS_LIST=(
@@ -84,6 +89,8 @@ for bus in "${BUS_LIST[@]}"; do
 
     # Let's reload the systemd daemon to test (de)serialization as well
     systemctl daemon-reload
+    # FIXME: explicitly trigger reexecute until systemd/systemd#27204 is resolved
+    systemctl daemon-reexec
 done
 
 umount /var/lib/machines
@@ -95,6 +102,8 @@ for bus in "${SESSION_BUS_LIST[@]}"; do
 
     # Let's reload the systemd user daemon to test (de)serialization as well
     systemctl --machine 'testuser@.host' --user daemon-reload
+    # FIXME: explicitly trigger reexecute until systemd/systemd#27204 is resolved
+    systemctl --machine 'testuser@.host' --user daemon-reexec
 done
 
 echo OK >/testok