From ff9eae09c4479bd91235c81bbdc2f7a961f1f3a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Wed, 2 Jul 2025 17:57:14 +0200 Subject: [PATCH] Allow reruns for test_json and test_xml tests These tests have been unstable under TSAN in the past, but it appears that the same failure mode can happen outside of TSAN tests as well. These tests have produced 12 failures combined in the past three weeks in nightlies. (cherry picked from commit 66f6f4bba99ca5975253c536bb46eae1188a28db) --- bin/tests/system/isctest/mark.py | 4 ---- bin/tests/system/statschannel/tests_json.py | 2 +- bin/tests/system/statschannel/tests_xml.py | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bin/tests/system/isctest/mark.py b/bin/tests/system/isctest/mark.py index 44bbe1320e..115d68ac51 100644 --- a/bin/tests/system/isctest/mark.py +++ b/bin/tests/system/isctest/mark.py @@ -54,10 +54,6 @@ def is_dnsrps_available(): return True -def with_tsan(*args): # pylint: disable=unused-argument - return feature_test("--tsan") - - have_libxml2 = pytest.mark.skipif( not feature_test("--have-libxml2"), reason="libxml2 support disabled in the build" ) diff --git a/bin/tests/system/statschannel/tests_json.py b/bin/tests/system/statschannel/tests_json.py index 62f8bcab14..6446fd8a75 100755 --- a/bin/tests/system/statschannel/tests_json.py +++ b/bin/tests/system/statschannel/tests_json.py @@ -119,6 +119,6 @@ def test_zone_with_many_keys_json(statsport): ) -@isctest.mark.flaky(max_runs=2, rerun_filter=isctest.mark.with_tsan) +@isctest.mark.flaky(max_runs=2) def test_traffic_json(statsport): generic.test_traffic(fetch_traffic_json, statsip="10.53.0.2", statsport=statsport) diff --git a/bin/tests/system/statschannel/tests_xml.py b/bin/tests/system/statschannel/tests_xml.py index e301f6bf60..e0a6737320 100755 --- a/bin/tests/system/statschannel/tests_xml.py +++ b/bin/tests/system/statschannel/tests_xml.py @@ -148,6 +148,6 @@ def test_zone_with_many_keys_xml(statsport): ) -@isctest.mark.flaky(max_runs=2, rerun_filter=isctest.mark.with_tsan) +@isctest.mark.flaky(max_runs=2) def test_traffic_xml(statsport): generic.test_traffic(fetch_traffic_xml, statsip="10.53.0.2", statsport=statsport)