From 0c5d718849a3ed969c0ed8d5329a887381e130e5 Mon Sep 17 00:00:00 2001
From: Tom Krizek <tkrizek@isc.org>
Date: Tue, 22 Aug 2023 17:59:16 +0200
Subject: [PATCH] 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.

(cherry picked from commit 7522583b5756924e697f10633d7d5d476176c594)
---
 bin/tests/system/statschannel/generic.py    | 8 +++++---
 bin/tests/system/statschannel/tests_json.py | 2 --
 bin/tests/system/statschannel/tests_xml.py  | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/bin/tests/system/statschannel/generic.py b/bin/tests/system/statschannel/generic.py
index 5ff09e2570..bf4b038992 100644
--- 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 6be264f49a..c4599258ea 100755
--- 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 6375d8a243..7f0b37e846 100755
--- 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,