]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: bump the trigger limit interval when running w/o KVM
authorFrantisek Sumsal <frantisek@sumsal.cz>
Tue, 5 Sep 2023 11:14:39 +0000 (13:14 +0200)
committerFrantisek Sumsal <frantisek@sumsal.cz>
Tue, 5 Sep 2023 11:14:39 +0000 (13:14 +0200)
As we might be slow enough to miss the trigger limit. Spotted in a nightly
cron build on C8S.

test/TEST-07-PID1/test.sh

index 1c3d7137feb81f91b15049602401b77642144c4f..1f9a9294667bd5b1c6c94e626a71c1fcb92d0d2a 100755 (executable)
@@ -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