From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Tue, 5 Sep 2023 11:14:39 +0000 (+0200)
Subject: test: bump the trigger limit interval when running w/o KVM
X-Git-Tag: v255-rc1~578^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54bf13a46a826d5918861df74ace249b77a4fc7e;p=thirdparty%2Fsystemd.git

test: bump the trigger limit interval when running w/o KVM

As we might be slow enough to miss the trigger limit. Spotted in a nightly
cron build on C8S.
---

diff --git a/test/TEST-07-PID1/test.sh b/test/TEST-07-PID1/test.sh
index 1c3d7137feb..1f9a9294667 100755
--- a/test/TEST-07-PID1/test.sh
+++ b/test/TEST-07-PID1/test.sh
@@ -10,12 +10,12 @@ TEST_DESCRIPTION="Tests for core PID1 functionality"
 test_append_files() {
     local workspace="${1:?}"
 
-    # Collecting coverage slows this particular test quite a bit, causing
-    # it to fail with the default settings (20 triggers per 2 secs).
-    # Let's help it a bit in such case.
-    if get_bool "$IS_BUILT_WITH_COVERAGE"; then
+    # 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/coverage-override.conf"
+        printf "[Socket]\nTriggerLimitIntervalSec=10\n" >"$workspace/etc/systemd/system/issue2467.socket.d/TriggerLimitInterval.conf"
     fi
 
     # Issue: https://github.com/systemd/systemd/issues/2730