From ad23ff13deb4e057d435adb941e58cd552beac02 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 8 Dec 2023 18:01:42 +0100
Subject: [PATCH 1/2] test: reset systemd-udevd.service restart counter

Since we restart systemd-udevd here a couple of times, we might hit the
rate limit in later tests:

[   26.028355] testsuite-17.sh[2074]: + udevadm control -e
[   26.028355] testsuite-17.sh[2074]: + udevadm control -l emerg
[   26.126160] systemd[1]: systemd-udevd.service: Start request repeated too quickly.
[   26.126213] systemd[1]: systemd-udevd.service: Failed with result 'start-limit-hit'.
[   26.140310] systemd[1]: Failed to start systemd-udevd.service.
[   26.140897] systemd[1]: systemd-udevd-control.socket: Failed with result 'service-start-limit-hit'.
[   26.141286] systemd[1]: systemd-udevd-kernel.socket: Failed with result 'service-start-limit-hit'.
[   26.142225] testsuite-17.sh[2074]: + udevadm control -l alert
[   26.149206] udevadm[2088]: Failed to send request to set log level: No such file or directory

Follow-up to: 6ef512c0bb
---
 test/units/testsuite-17.06.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/units/testsuite-17.06.sh b/test/units/testsuite-17.06.sh
index 4d452ff97c..6d83645303 100755
--- a/test/units/testsuite-17.06.sh
+++ b/test/units/testsuite-17.06.sh
@@ -64,5 +64,6 @@ rm /run/udev/rules.d/00-debug.rules
 rm /run/udev/rules.d/50-testsuite.rules
 
 udevadm control --reload
+systemctl reset-failed systemd-udevd.service
 
 exit 0

From e23fc070e287397d2f047028f953986356badf2f Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 8 Dec 2023 18:38:41 +0100
Subject: [PATCH 2/2] test: backup /etc/udev/udev.conf only if it exists

On Fedora systemd recently moved all of its configuration files to
/usr/lib/ [0], so make sure we account for this case as well.

[   42.450325] testsuite-17.sh[800]: + mkdir -p /run/udev/rules.d
[   42.466504] testsuite-17.sh[800]: + cp -f /etc/udev/udev.conf /etc/udev/udev.conf.bckp
[   42.503348] testsuite-17.sh[802]: cp: cannot stat '/etc/udev/udev.conf': No such file or directory

[0] https://src.fedoraproject.org/rpms/systemd/c/29eb35530b29232eed65718d0cd96d67cd7ffd6b?branch=rawhide
---
 test/units/testsuite-17.03.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/units/testsuite-17.03.sh b/test/units/testsuite-17.03.sh
index fafe9d186c..9af706fae1 100755
--- a/test/units/testsuite-17.03.sh
+++ b/test/units/testsuite-17.03.sh
@@ -2,17 +2,18 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -ex
 
-test_rule="/run/udev/rules.d/49-test.rules"
+TEST_RULE="/run/udev/rules.d/49-test.rules"
 KILL_PID=
 
 setup() {
-    mkdir -p "${test_rule%/*}"
-    cp -f /etc/udev/udev.conf /etc/udev/udev.conf.bckp
-    cat >"${test_rule}" <<EOF
+    mkdir -p "${TEST_RULE%/*}"
+    [[ -e /etc/udev/udev.conf ]] && cp -f /etc/udev/udev.conf /etc/udev/udev.conf.bak
+
+    cat >"${TEST_RULE}" <<EOF
 ACTION=="add", SUBSYSTEM=="mem", KERNEL=="null", OPTIONS="log_level=debug"
 ACTION=="add", SUBSYSTEM=="mem", KERNEL=="null", PROGRAM=="/bin/sleep 60"
 EOF
-    cat >>/etc/udev/udev.conf <<EOF
+    cat >/etc/udev/udev.conf <<EOF
 event_timeout=10
 timeout_signal=SIGABRT
 EOF
@@ -29,9 +30,8 @@ teardown() {
     fi
 
     rm -rf "$TMPDIR"
-
-    mv -f /etc/udev/udev.conf.bckp /etc/udev/udev.conf
-    rm -f "$test_rule"
+    rm -f "$TEST_RULE"
+    [[ -e /etc/udev/udev.conf.bak ]] && mv -f /etc/udev/udev.conf.bak /etc/udev/udev.conf
     systemctl restart systemd-udevd.service
 }