test: tweak TriggerLimitIntervalSec= if we're running w/o KVM as well

mrc0mmand · yuwata · commit 8470a16d6f95 · 2021-12-22T08:56:20.000+09:00
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: systemd#21808 (comment)
diff --git 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
     )
 }

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,13 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/17433"`
`9`	`9`
`10`	`10`	`test_append_files() {`
`11`	`11`	`(`
`12`		`- # Collecting coverage slows this particular test quite a bit, causing`
`13`		`- # it to fail with the default settings (20 triggers per 2 secs)`
`14`		`- # to trip over the default limit. Let's help it a bit in such case.`
`15`		`- if get_bool "$IS_BUILT_WITH_COVERAGE"; then`
	`12`	`+ # Tweak the trigger limit interval in case we are collecting coverage`
	`13`	`+ # or running without KVM - in both cases we might be slow enough that`
	`14`	`+ # we could miss the default rate-limit window and cause the test to fail`
	`15`	`+ # unexpectedly.`
	`16`	`+ if get_bool "$IS_BUILT_WITH_COVERAGE" \|\| ! get_bool "$QEMU_KVM"; then`
`16`	`17`	`mkdir -p "${initdir:?}/etc/systemd/system/test63.path.d"`
`17`		`- printf "[Path]\nTriggerLimitIntervalSec=10\n" >"${initdir:?}/etc/systemd/system/test63.path.d/coverage-override.conf"`
	`18`	`+ printf "[Path]\nTriggerLimitIntervalSec=10\n" >"${initdir:?}/etc/systemd/system/test63.path.d/triggerlimitinterval-override.conf"`
`18`	`19`	`fi`
`19`	`20`	`)`
`20`	`21`	`}`