Disable loadtime check in statschannel test

It is better to disable the specific check that causes the test to fail
rather than mark the entire test as xfail, which can mask other issues
which the test is capable of detecting.

diff --git a/bin/tests/system/statschannel/generic.py b/bin/tests/system/statschannel/generic.py
index 5ff09e257049b2745ae4f12e1c8ab2cedb3034e7..bf4b0389927441818a8ec61d4c40f5b504e4f6fa 100644 (file)
--- a/bin/tests/system/statschannel/generic.py
+++ b/bin/tests/system/statschannel/generic.py
@@ -34,10 +34,12 @@ def check_refresh(refresh, min_time, max_time):
     assert refresh <= max_time
 
 
-def check_loaded(loaded, expected):
+def check_loaded(loaded, expected):  # pylint: disable=unused-argument
     # Sanity check the zone timers values
-    assert loaded == expected
-    assert loaded < now
+    # NOTE This check has been disabled due to GL #3983
+    # assert loaded == expected
+    # assert loaded < now
+    pass
 
 
 def check_zone_timers(loaded, expires, refresh, loaded_exp):

diff --git a/bin/tests/system/statschannel/tests_json.py b/bin/tests/system/statschannel/tests_json.py
index 6be264f49a4c6267d81af63208f56f09424cbce1..c4599258ea4365a56ff2ede78286ad280172c4ec 100755 (executable)
--- a/bin/tests/system/statschannel/tests_json.py
+++ b/bin/tests/system/statschannel/tests_json.py
@@ -12,7 +12,6 @@
 # information regarding copyright ownership.
 
 from datetime import datetime
-import os
 
 import pytest
 
@@ -83,7 +82,6 @@ def test_zone_timers_primary_json(statsport):
     )
 
 
-@pytest.mark.xfail(reason="GL #3983", strict="LEGACY_TEST_RUNNER" not in os.environ)
 def test_zone_timers_secondary_json(statsport):
     generic.test_zone_timers_secondary(
         fetch_zones_json,

diff --git a/bin/tests/system/statschannel/tests_xml.py b/bin/tests/system/statschannel/tests_xml.py
index 6375d8a2433fd8d637bc13f6347cc5e3afb91330..7f0b37e846368bedf6959eb9807824010f8b23b8 100755 (executable)
--- a/bin/tests/system/statschannel/tests_xml.py
+++ b/bin/tests/system/statschannel/tests_xml.py
@@ -12,7 +12,6 @@
 # information regarding copyright ownership.
 
 from datetime import datetime
-import os
 import xml.etree.ElementTree as ET
 
 import pytest
@@ -113,7 +112,6 @@ def test_zone_timers_primary_xml(statsport):
     )
 
 
-@pytest.mark.xfail(reason="GL #3983", strict="LEGACY_TEST_RUNNER" not in os.environ)
 def test_zone_timers_secondary_xml(statsport):
     generic.test_zone_timers_secondary(
         fetch_zones_xml,