From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 4 May 2024 11:22:53 +0000 (+0200)
Subject: TEST-07-PID1: Lower TriggerLimitIntervalSec= unconditionally
X-Git-Tag: v256-rc2~97^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=733d0594f024fad76453a1ac38ea68eb0377b064;p=thirdparty%2Fsystemd.git

TEST-07-PID1: Lower TriggerLimitIntervalSec= unconditionally

It shouldn't hurt to do this when KVM is enabled or we're not collecting
coverage so let's just always lower the trigger limit interval.
---

diff --git a/test/TEST-07-PID1/test.sh b/test/TEST-07-PID1/test.sh
index b60f1db68fd..2513406e0de 100755
--- a/test/TEST-07-PID1/test.sh
+++ b/test/TEST-07-PID1/test.sh
@@ -11,16 +11,6 @@ NSPAWN_ARGUMENTS="--capability=CAP_NET_ADMIN"
 . "${TEST_BASE_DIR:?}/test-functions"
 
 test_append_files() {
-    local workspace="${1:?}"
-
-    # We might not be fast enough to hit the limit (20 triggers per 2 secs)
-    # in certain environments, i.e. when running without KVM or when collecting
-    # coverage. Let's help it a bit in such case.
-    if ! get_bool "$QEMU_KVM" || get_bool "$IS_BUILT_WITH_COVERAGE"; then
-        mkdir -p "$workspace/etc/systemd/system/issue2467.socket.d"
-        printf "[Socket]\nTriggerLimitIntervalSec=10\n" >"$workspace/etc/systemd/system/issue2467.socket.d/TriggerLimitInterval.conf"
-    fi
-
     image_install logger socat
 }
 
diff --git a/test/testsuite-07.units/issue2467.socket b/test/testsuite-07.units/issue2467.socket
index af1317b409d..209b6bbce5d 100644
--- a/test/testsuite-07.units/issue2467.socket
+++ b/test/testsuite-07.units/issue2467.socket
@@ -1,3 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Socket]
 ListenStream=/run/test.ctl
+# We might not be fast enough to hit the default limit (20 triggers per 2 secs)
+# in certain environments, i.e. when running without KVM or when collecting
+# coverage. Let's help it a bit in such cases by lowering the limit to 10 seconds.
+TriggerLimitIntervalSec=10