Use relative imports and __init__.py in the statschannel test

This is in preparation for automatic import sorting.

diff --git a/bin/tests/system/statschannel/__init__.py b/bin/tests/system/statschannel/__init__.py
new file mode 100644 (file)
index 0000000..6ba22b9
--- /dev/null
+++ b/bin/tests/system/statschannel/__init__.py
@@ -0,0 +1,15 @@
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0.  If a copy of the MPL was not distributed with this
+# file, you can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+
+import pytest
+
+pytest.register_assert_rewrite("generic")

diff --git a/bin/tests/system/statschannel/tests_json.py b/bin/tests/system/statschannel/tests_json.py
index c495a94a83bfc985fd154ee775293f7532f489e3..926da5dab4e8bb8662ef31d02d72bb45cdf290ce 100755 (executable)
--- a/bin/tests/system/statschannel/tests_json.py
+++ b/bin/tests/system/statschannel/tests_json.py
@@ -18,8 +18,7 @@ import requests
 
 import isctest.mark
 
-pytest.register_assert_rewrite("generic")
-import generic
+from . import generic
 
 pytestmark = [
     isctest.mark.with_json_c,

diff --git a/bin/tests/system/statschannel/tests_xml.py b/bin/tests/system/statschannel/tests_xml.py
index 97ca7c136509c4e1a81c11b83b51d1a1cf5d5f34..b7a1992846b14cf9bd6dd594c89ed38346506ecd 100755 (executable)
--- a/bin/tests/system/statschannel/tests_xml.py
+++ b/bin/tests/system/statschannel/tests_xml.py
@@ -19,8 +19,7 @@ import requests
 
 import isctest.mark
 
-pytest.register_assert_rewrite("generic")
-import generic
+from . import generic
 
 pytestmark = [
     isctest.mark.with_libxml2,