Allow re-run of kasp test case on all FreeBSDs

Previously, the issue when the kasp.test_kasp_case[secondary.kasp] fails
due to a timeout has been only ocassionally observed on FreeBSD 13
in our CI. It seems to have come back on FreeBSD 15.

(cherry picked from commit e4abb5bd070c040320cc23126c5cd9e4c726c72c)

diff --git a/bin/tests/system/isctest/mark.py b/bin/tests/system/isctest/mark.py
index 805371701df179106ad0dfe750fa18e6c8da3631..4d7fcce147b6fc6c1650efb422139de1774ce733 100644 (file)
--- a/bin/tests/system/isctest/mark.py
+++ b/bin/tests/system/isctest/mark.py
@@ -43,6 +43,10 @@ def is_dnsrps_available():
     return True
 
 
+def is_host_freebsd(*_):
+    return platform.system() == "FreeBSD"
+
+
 def is_host_freebsd_13(*_):
     return platform.system() == "FreeBSD" and platform.release().startswith("13")
 

diff --git a/bin/tests/system/kasp/tests_kasp.py b/bin/tests/system/kasp/tests_kasp.py
index 1a836a230d4dfe4ff85a22fca5acd108c7f519f0..89f2696e5687b29697861f37f664eacb1dbcad05 100644 (file)
--- a/bin/tests/system/kasp/tests_kasp.py
+++ b/bin/tests/system/kasp/tests_kasp.py
@@ -596,7 +596,7 @@ def cb_remove_keyfiles(params, ksks=None, zsks=None):
             },
             id="secondary.kasp",
             marks=pytest.mark.flaky(
-                max_runs=2, rerun_filter=isctest.mark.is_host_freebsd_13
+                max_runs=2, rerun_filter=isctest.mark.is_host_freebsd
             ),
         ),
         pytest.param(