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.

(cherry picked from commit ec2fc7680a4508c496c5817e4ba0d5c9c6475e70)

diff --git a/bin/tests/system/isctest/mark.py b/bin/tests/system/isctest/mark.py
index 0caac51af5b49fffc892738c685bab44fcfb4373..456586ac955879abd2bf3011c2aea61a9aa0b984 100644 (file)
--- 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 9b525418473868a153a86d579e34a0b7f30a4368..ef4696cdcf6794a84533fd7fa266d0ffd9a0abec 100755 (executable)
--- 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 81ac187587b0a9f607703d5340243c2716fc61a5..93ba0bdb2fd7dc9d4f100bda8a90b75e16dc3a60 100755 (executable)
--- 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)