From 8470a16d6f95312019f2f48de3c4e2b58910eae3 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Tue, 21 Dec 2021 20:45:18 +0100 Subject: [PATCH] test: tweak TriggerLimitIntervalSec= if we're running w/o KVM as well since in that case we might be also slow enough to miss the rate-limit window. However, let's not set the trigger limit unconditionally to still have coverage for the unaltered path unit (but without sacrificing CI stability). See: https://github.com/systemd/systemd/pull/21808#issuecomment-998927401 --- test/TEST-63-ISSUE-17433/test.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/TEST-63-ISSUE-17433/test.sh b/test/TEST-63-ISSUE-17433/test.sh index fd83b5fa6f2..65f41ed1deb 100755 --- a/test/TEST-63-ISSUE-17433/test.sh +++ b/test/TEST-63-ISSUE-17433/test.sh @@ -9,12 +9,13 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/17433" test_append_files() { ( - # Collecting coverage slows this particular test quite a bit, causing - # it to fail with the default settings (20 triggers per 2 secs) - # to trip over the default limit. Let's help it a bit in such case. - if get_bool "$IS_BUILT_WITH_COVERAGE"; then + # Tweak the trigger limit interval in case we are collecting coverage + # or running without KVM - in both cases we might be slow enough that + # we could miss the default rate-limit window and cause the test to fail + # unexpectedly. + if get_bool "$IS_BUILT_WITH_COVERAGE" || ! get_bool "$QEMU_KVM"; then mkdir -p "${initdir:?}/etc/systemd/system/test63.path.d" - printf "[Path]\nTriggerLimitIntervalSec=10\n" >"${initdir:?}/etc/systemd/system/test63.path.d/coverage-override.conf" + printf "[Path]\nTriggerLimitIntervalSec=10\n" >"${initdir:?}/etc/systemd/system/test63.path.d/triggerlimitinterval-override.conf" fi ) } -- 2.47.3