From: Nicki Křížek Date: Mon, 12 Aug 2024 13:43:19 +0000 (+0200) Subject: Allow rerun of unstable statschannel tests under TSAN X-Git-Tag: v9.21.1~37^2 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=ec2fc7680a4508c496c5817e4ba0d5c9c6475e70;p=thirdparty%2Fbind9.git Allow rerun of unstable statschannel tests under TSAN The test_traffic_json and test_traffic_xml occasionally fail when running under TSAN. This happens in CI and is most likely a result of some instability that doesn't seem to be easily reproduced. --- diff --git a/bin/tests/system/isctest/mark.py b/bin/tests/system/isctest/mark.py index 0caac51af5b..456586ac955 100644 --- a/bin/tests/system/isctest/mark.py +++ b/bin/tests/system/isctest/mark.py @@ -47,6 +47,10 @@ 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 9b525418473..ef4696cdcf6 100755 --- a/bin/tests/system/statschannel/tests_json.py +++ b/bin/tests/system/statschannel/tests_json.py @@ -100,5 +100,6 @@ def test_zone_with_many_keys_json(statsport): ) +@isctest.mark.flaky(max_runs=2, rerun_filter=isctest.mark.with_tsan) 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 81ac187587b..93ba0bdb2fd 100755 --- a/bin/tests/system/statschannel/tests_xml.py +++ b/bin/tests/system/statschannel/tests_xml.py @@ -130,5 +130,6 @@ def test_zone_with_many_keys_xml(statsport): ) +@isctest.mark.flaky(max_runs=2, rerun_filter=isctest.mark.with_tsan) def test_traffic_xml(statsport): generic.test_traffic(fetch_traffic_xml, statsip="10.53.0.2", statsport=statsport)