refactor(tests): move some definitions

Author: marioevz

tests/json_infra/conftest.py

@@ -1,6 +1,5 @@
 """Pytest configuration for the json infra tests."""
 
-import json
 import os
 import shutil
 import tarfile
@@ -9,7 +8,6 @@
 from typing import (
     Callable,
     Final,
-    Generator,
     Optional,
     Self,
     Set,
@@ -22,12 +20,12 @@
 from _pytest.nodes import Item
 from filelock import FileLock
 from git.exc import GitCommandError, InvalidGitRepositoryError
-from pytest import Collector, File, Session, StashKey, fixture
+from pytest import Collector, Session, StashKey, fixture
 from requests_cache import CachedSession
 from requests_cache.backends.sqlite import SQLiteCache
 
 from . import TEST_FIXTURES
-from .helpers import ALL_FIXTURE_TYPES
+from .helpers import FixturesFile
 
 try:
     from xdist import get_xdist_worker_id
@@ -299,35 +297,3 @@ def pytest_collect_file(
     if file_path.suffix == ".json":
         return FixturesFile.from_parent(parent, path=file_path)
     return None
-
-
-class FixturesFile(File):
-    """Single JSON file containing fixtures."""
-
-    def collect(
-        self: Self,
-    ) -> Generator[Item | Collector, None, None]:
-        """Collect test cases from a single JSON fixtures file."""
-        with open(self.path, "r") as file:
-            try:
-                loaded_file = json.load(file)
-            except Exception:
-                return  # Skip *.json files that are unreadable.
-            if not isinstance(loaded_file, dict):
-                return
-            for key, test_dict in loaded_file.items():
-                if not isinstance(test_dict, dict):
-                    continue
-                for fixture_type in ALL_FIXTURE_TYPES:
-                    if not fixture_type.is_format(test_dict):
-                        continue
-                    name = key
-                    if "::" in name:
-                        name = name.split("::")[1]
-                    yield fixture_type.from_parent(  # type: ignore
-                        parent=self,
-                        name=name,
-                        test_file=str(self.path),
-                        test_key=key,
-                        test_dict=test_dict,
-                    )

tests/json_infra/helpers/__init__.py

@@ -1,14 +1,10 @@
 """Helpers to load tests from JSON files."""
 
-from typing import List, Type
-
-from .fixtures import Fixture
+from .fixtures import ALL_FIXTURE_TYPES, Fixture, FixturesFile
 from .load_blockchain_tests import BlockchainTestFixture
 from .load_state_tests import StateTestFixture
 
-ALL_FIXTURE_TYPES: List[Type[Fixture]] = [
-    BlockchainTestFixture,
-    StateTestFixture,
-]
+ALL_FIXTURE_TYPES.append(BlockchainTestFixture)
+ALL_FIXTURE_TYPES.append(StateTestFixture)
 
-__all__ = ["ALL_FIXTURE_TYPES", "Fixture"]
+__all__ = ["ALL_FIXTURE_TYPES", "Fixture", "FixturesFile"]

tests/json_infra/helpers/fixtures.py

@@ -1,9 +1,11 @@
 """Base class for all fixture loaders."""
 
+import json
 from abc import ABC, abstractmethod
-from typing import Any, Dict, Self
+from typing import Any, Dict, Generator, List, Self, Type
 
 from _pytest.nodes import Node
+from pytest import Collector, File, Item
 
 
 class Fixture(ABC):
@@ -47,3 +49,38 @@ def from_parent(
     def is_format(cls, test_dict: Dict[str, Any]) -> bool:
         """Return true if the object can be parsed as the fixture type."""
         pass
+
+
+ALL_FIXTURE_TYPES: List[Type[Fixture]] = []
+
+
+class FixturesFile(File):
+    """Single JSON file containing fixtures."""
+
+    def collect(
+        self: Self,
+    ) -> Generator[Item | Collector, None, None]:
+        """Collect test cases from a single JSON fixtures file."""
+        with open(self.path, "r") as file:
+            try:
+                loaded_file = json.load(file)
+            except Exception:
+                return  # Skip *.json files that are unreadable.
+            if not isinstance(loaded_file, dict):
+                return
+            for key, test_dict in loaded_file.items():
+                if not isinstance(test_dict, dict):
+                    continue
+                for fixture_type in ALL_FIXTURE_TYPES:
+                    if not fixture_type.is_format(test_dict):
+                        continue
+                    name = key
+                    if "::" in name:
+                        name = name.split("::")[1]
+                    yield fixture_type.from_parent(  # type: ignore
+                        parent=self,
+                        name=name,
+                        test_file=str(self.path),
+                        test_key=key,
+                        test_dict=test_dict,
+                    )