jackrosenthal · jackrosenthal · Apr 20, 2022 · Apr 20, 2022
diff --git a/.flake8 b/.flake8
@@ -11,4 +11,4 @@ exclude =
 per-file-ignores =
     # This file uses names from Kajiki's IR language, and confuses
     # flake8:
-    kajiki/tests/test_runtime.py: F821
+    tests/test_runtime.py: F821
diff --git a/kajiki/tests/data/__init__.py b/kajiki/tests/data/__init__.py
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -0,0 +1,25 @@
+import importlib
+import pathlib
+import sys
+
+import pytest
+
+
+@pytest.fixture(scope="session", autouse=True)
+def add_test_data_module():
+    here = pathlib.Path(__file__).parent
+    data_package = here / "data" / "__init__.py"
+    spec = importlib.util.spec_from_file_location("kajiki_test_data", str(data_package))
+
+    # TODO(Python3.4): below dance can change to
+    # importlib.util.module_from_spec() when support for Python 3.4 is
+    # dropped.
+    module = type(sys)(spec.name)
+    module.__name__ = spec.name
+    module.__loader__ = spec.loader
+    module.__package__ = spec.parent
+    module.__path__ = spec.submodule_search_locations
+    module.__file__ = spec.origin
+
+    sys.modules[spec.name] = module
+    spec.loader.exec_module(module)
diff --git a/kajiki/tests/__init__.py → tests/data/__init__.py b/kajiki/tests/__init__.py → tests/data/__init__.py
diff --git a/kajiki/tests/data/debug.html → tests/data/debug.html b/kajiki/tests/data/debug.html → tests/data/debug.html
diff --git a/kajiki/tests/data/debug.txt → tests/data/debug.txt b/kajiki/tests/data/debug.txt → tests/data/debug.txt
diff --git a/kajiki/tests/data/error.html → tests/data/error.html b/kajiki/tests/data/error.html → tests/data/error.html
diff --git a/kajiki/tests/data/file_child.html → tests/data/file_child.html b/kajiki/tests/data/file_child.html → tests/data/file_child.html
diff --git a/kajiki/tests/data/file_parent.html → tests/data/file_parent.html b/kajiki/tests/data/file_parent.html → tests/data/file_parent.html
diff --git a/kajiki/tests/data/golden/kitchensink1.html → tests/data/golden/kitchensink1.html b/kajiki/tests/data/golden/kitchensink1.html → tests/data/golden/kitchensink1.html
diff --git a/kajiki/tests/data/kitchensink.html → tests/data/kitchensink.html b/kajiki/tests/data/kitchensink.html → tests/data/kitchensink.html
diff --git a/kajiki/tests/data/simple.html → tests/data/simple.html b/kajiki/tests/data/simple.html → tests/data/simple.html
diff --git a/kajiki/tests/test_cli.py → tests/test_cli.py b/kajiki/tests/test_cli.py → tests/test_cli.py
diff --git a/kajiki/tests/test_doctype.py → tests/test_doctype.py b/kajiki/tests/test_doctype.py → tests/test_doctype.py
diff --git a/kajiki/tests/test_e2e.py → tests/test_e2e.py b/kajiki/tests/test_e2e.py → tests/test_e2e.py
@@ -13,7 +13,7 @@
 @pytest.mark.parametrize(
     ["args", "golden_file"],
     [
-        (["-p", "kajiki.tests.data.kitchensink"], "kitchensink1.html"),
+        (["-p", "kajiki_test_data.kitchensink"], "kitchensink1.html"),
         ([str(DATA / "kitchensink.html")], "kitchensink1.html"),
     ],
 )

diff --git a/kajiki/tests/test_ir.py → tests/test_ir.py b/kajiki/tests/test_ir.py → tests/test_ir.py
diff --git a/kajiki/tests/test_runtime.py → tests/test_runtime.py b/kajiki/tests/test_runtime.py → tests/test_runtime.py
diff --git a/kajiki/tests/test_text.py → tests/test_text.py b/kajiki/tests/test_text.py → tests/test_text.py
diff --git a/kajiki/tests/test_xml.py → tests/test_xml.py b/kajiki/tests/test_xml.py → tests/test_xml.py
@@ -1006,7 +1006,7 @@ def test_debug(self):
 class TestPackageLoader(TestCase):
     def test_pkg_loader(self):
         loader = PackageLoader()
-        loader.import_("kajiki.tests.data.debug")
+        loader.import_("kajiki_test_data.debug")
 
 
 class TestBuiltinFunctions(TestCase):