From: Nicki Křížek <nicki@isc.org>
Date: Thu, 3 Jul 2025 12:40:06 +0000 (+0200)
Subject: Allow dnstap system test rerun on freebsd13
X-Git-Tag: v9.21.11~67^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34867e16936f79905b7189bd7d51248527e57ce3;p=thirdparty%2Fbind9.git

Allow dnstap system test rerun on freebsd13

The check "unix socket message counts" sometimes fails with "dnstap
output file smaller than expected". This only happens on freebsd13 and
can't be reproduced easily. There was an attempt to decrease the
required file size in the past, but apparently, the issue can still
occur.
---

diff --git a/bin/tests/system/dnstap/tests_sh_dnstap.py b/bin/tests/system/dnstap/tests_sh_dnstap.py
index 10d9a4111b2..e487ca2d089 100644
--- a/bin/tests/system/dnstap/tests_sh_dnstap.py
+++ b/bin/tests/system/dnstap/tests_sh_dnstap.py
@@ -31,5 +31,6 @@ pytestmark = [
 ]
 
 
+@isctest.mark.flaky(max_runs=2, rerun_filter=isctest.mark.is_host_freebsd_13)
 def test_dnstap(run_tests_sh):
     run_tests_sh()
diff --git a/bin/tests/system/isctest/mark.py b/bin/tests/system/isctest/mark.py
index b4617ced81d..199cc92e424 100644
--- a/bin/tests/system/isctest/mark.py
+++ b/bin/tests/system/isctest/mark.py
@@ -12,6 +12,7 @@
 # information regarding copyright ownership.
 
 import os
+import platform
 import shutil
 import subprocess
 
@@ -39,6 +40,10 @@ def feature_test(feature):
     return True
 
 
+def is_host_freebsd_13(*_):
+    return platform.system() == "FreeBSD" and platform.release().startswith("13")
+
+
 def with_algorithm(name: str):
     key = f"{name}_SUPPORTED"
     assert key in os.environ, f"{key} env variable undefined"
diff --git a/bin/tests/system/timeouts/tests_tcp_timeouts.py b/bin/tests/system/timeouts/tests_tcp_timeouts.py
index 1750715ce08..1fe1088a695 100644
--- a/bin/tests/system/timeouts/tests_tcp_timeouts.py
+++ b/bin/tests/system/timeouts/tests_tcp_timeouts.py
@@ -13,7 +13,6 @@
 
 # pylint: disable=unused-variable
 
-import platform
 import socket
 import time
 
@@ -68,11 +67,7 @@ def test_initial_timeout(named_port):
                 raise EOFError from e
 
 
-def is_host_freebsd_13(*_):
-    return platform.system() == "FreeBSD" and platform.release().startswith("13")
-
-
-@isctest.mark.flaky(max_runs=2, rerun_filter=is_host_freebsd_13)
+@isctest.mark.flaky(max_runs=2, rerun_filter=isctest.mark.is_host_freebsd_13)
 def test_idle_timeout(named_port):
     #
     # The idle timeout is 5 seconds, so the third message should fail