Merging upstream version 1:9.18.24.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 5 insertions, 6 deletions

diff --git a/bin/tests/system/statschannel/tests_json.py b/bin/tests/system/statschannel/tests_json.py
index c459925..4f7c4a7 100755
--- a/bin/tests/system/statschannel/tests_json.py
+++ b/bin/tests/system/statschannel/tests_json.py
@@ -15,9 +15,11 @@ from datetime import datetime
 
 import pytest
 
-import generic
 import pytest_custom_markers
 
+pytest.register_assert_rewrite("generic")
+import generic
+
 pytestmark = pytest_custom_markers.have_json_c
 requests = pytest.importorskip("requests")
 
@@ -98,8 +100,5 @@ def test_zone_with_many_keys_json(statsport):
     )
 
 
-def test_traffic_json(named_port, statsport):
-    generic_dnspython = pytest.importorskip("generic_dnspython")
-    generic_dnspython.test_traffic(
-        fetch_traffic_json, statsip="10.53.0.2", statsport=statsport, port=named_port
-    )
+def test_traffic_json(statsport):
+    generic.test_traffic(fetch_traffic_json, statsip="10.53.0.2", statsport=statsport)