post-review: use pytest mark

Author: gurukamath

pyproject.toml

@@ -224,6 +224,9 @@ markers = [
     "slow: marks tests as slow (deselect with '-m \"not slow\"')",
     "bigmem: marks tests as big memory (deselect with '-m \"not bigmem\"')",
     "evm_tools: marks tests as evm_tools (deselect with '-m \"not evm_tools\"')",
+    "json_blockchain_tests: marks tests as json_blockchain_tests (deselect with '-m \"not json_blockchain_tests\"')",
+    "json_state_tests: marks tests as json_state_tests (deselect with '-m \"not json_state_tests\"')",
+    "vm_test: marks tests as vm_test (deselect with '-m \"not vm_test\"')",
 ]
 
 [tool.coverage.run]

tests/json_infra/conftest.py

@@ -8,6 +8,7 @@
 import requests_cache
 from _pytest.config import Config
 from _pytest.config.argparsing import Parser
+from _pytest.nodes import Item
 from filelock import FileLock
 from git.exc import GitCommandError, InvalidGitRepositoryError
 from pytest import Session, StashKey
@@ -17,9 +18,6 @@
 
 from . import TEST_FIXTURES
 
-# Global variable to store pytest config for access during test collection
-pytest_config = None
-
 try:
     from xdist import get_xdist_worker_id  # type: ignore[import-untyped]
 except ImportError:
@@ -63,9 +61,6 @@ def pytest_configure(config: Config) -> None:
     """
     Configure the ethereum module and log levels to output evm trace.
     """
-    global pytest_config
-    pytest_config = config
-
     if config.getoption("optimized"):
         import ethereum_optimized
 
@@ -81,6 +76,38 @@ def pytest_configure(config: Config) -> None:
         ethereum.trace.set_evm_trace(Eip3155Tracer())
 
 
+def pytest_collection_modifyitems(config: Config, items: list[Item]) -> None:
+    desired_fork = config.getoption("fork", None)
+    if not desired_fork:
+        return
+
+    selected = []
+    deselected = []
+
+    for item in items:
+        forks_of_test = [m.args[0] for m in item.iter_markers(name="fork")]
+        if forks_of_test and desired_fork not in forks_of_test:
+            deselected.append(item)
+        # Check if the test has a vm test marker
+        elif any(item.iter_markers(name="vm_test")):
+            callspec = getattr(item, "callspec", None)
+            if not callspec or "fork" not in getattr(callspec, "params", {}):
+                # no fork param on this test. We keep the test
+                selected.append(item)
+                continue
+            fork_param = callspec.params["fork"]
+            if fork_param[0] == desired_fork:
+                selected.append(item)
+            else:
+                deselected.append(item)
+        else:
+            selected.append(item)
+
+    if deselected:
+        config.hook.pytest_deselected(items=deselected)
+        items[:] = selected  # keep only what matches
+
+
 class _FixturesDownloader:
     cache: Final[SQLiteCache]
     session: Final[CachedSession]

tests/json_infra/test_blockchain_tests.py

@@ -3,7 +3,6 @@
 import pytest
 
 from . import FORKS
-from .conftest import pytest_config
 from .helpers.load_blockchain_tests import (
     Load,
     fetch_blockchain_tests,
@@ -13,6 +12,7 @@
 
 
 def _generate_test_function(fork_name: str) -> Callable:
+    @pytest.mark.fork(fork_name)
     @pytest.mark.json_blockchain_tests
     @pytest.mark.parametrize(
         "blockchain_test_case",
@@ -29,22 +29,7 @@ def test_func(blockchain_test_case: Dict) -> None:
     return test_func
 
 
-# Get the fork option from pytest config if available
-
-# Determine which forks to generate tests for
-if pytest_config and pytest_config.getoption("fork", None):
-    # If --fork option is specified, only generate test for that fork
-    fork_option = pytest_config.getoption("fork")
-    if fork_option in FORKS:
-        forks_to_test = [fork_option]
-    else:
-        # If specified fork is not valid, generate no tests
-        forks_to_test = []
-else:
-    # If no --fork option, generate tests for all forks
-    forks_to_test = list(FORKS.keys())
-
-for fork_name in forks_to_test:
+for fork_name in FORKS.keys():
     locals()[
         f"test_blockchain_tests_{fork_name.lower()}"
     ] = _generate_test_function(fork_name)

tests/json_infra/test_state_tests.py

@@ -3,11 +3,11 @@
 import pytest
 
 from . import FORKS
-from .conftest import pytest_config
 from .helpers.load_state_tests import fetch_state_tests, idfn, run_state_test
 
 
 def _generate_test_function(fork_name: str) -> Callable:
+    @pytest.mark.fork(fork_name)
     @pytest.mark.evm_tools
     @pytest.mark.json_state_tests
     @pytest.mark.parametrize(
@@ -22,22 +22,7 @@ def test_func(state_test_case: Dict) -> None:
     return test_func
 
 
-# Get the fork option from pytest config if available
-
-# Determine which forks to generate tests for
-if pytest_config and pytest_config.getoption("fork", None):
-    # If --fork option is specified, only generate test for that fork
-    fork_option = pytest_config.getoption("fork")
-    if fork_option in FORKS:
-        forks_to_test = [fork_option]
-    else:
-        # If specified fork is not valid, generate no tests
-        forks_to_test = []
-else:
-    # If no --fork option, generate tests for all forks
-    forks_to_test = list(FORKS.keys())
-
-for fork_name in forks_to_test:
+for fork_name in FORKS.keys():
     locals()[
         f"test_state_tests_{fork_name.lower()}"
     ] = _generate_test_function(fork_name)

tests/json_infra/test_transaction.py

@@ -11,7 +11,6 @@
 from ethereum.utils.hexadecimal import hex_to_uint
 
 from . import FORKS, TEST_FIXTURES
-from .conftest import pytest_config
 from .helpers.load_transaction_tests import NoTestsFound, load_test_transaction
 
 ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]
@@ -20,6 +19,7 @@
 
 
 def _generate_high_nonce_tests_function(fork_name: str) -> Callable:
+    @pytest.mark.fork(fork_name)
     @pytest.mark.parametrize(
         "test_file_high_nonce",
         [
@@ -74,20 +74,7 @@ def test_func(test_file_nonce: str) -> None:
     return test_func
 
 
-# Determine which forks to generate tests for
-if pytest_config and pytest_config.getoption("fork", None):
-    # If --fork option is specified, only generate test for that fork
-    fork_option = pytest_config.getoption("fork")
-    if fork_option in FORKS:
-        forks_to_test = [fork_option]
-    else:
-        # If specified fork is not valid, generate no tests
-        forks_to_test = []
-else:
-    # If no --fork option, generate tests for all forks
-    forks_to_test = list(FORKS.keys())
-
-for fork_name in forks_to_test:
+for fork_name in FORKS.keys():
     locals()[
         f"test_high_nonce_tests_{fork_name.lower()}"
     ] = _generate_high_nonce_tests_function(fork_name)

tests/json_infra/vm/__init__.py

@@ -1,5 +1,3 @@
-from ..conftest import pytest_config
-
 FORKS = [
     ("ConstantinopleFix", "constantinople"),
     ("Byzantium", "byzantium"),
@@ -8,20 +6,3 @@
     ("Homestead", "homestead"),
     ("Frontier", "frontier"),
 ]
-
-
-# Determine which forks to generate tests for
-if pytest_config and pytest_config.getoption("fork", None):
-    # If --fork option is specified, only generate test for that fork
-    fork_option = pytest_config.getoption("fork")
-    has_vm_tests = False
-    for fork in FORKS:
-        if fork[0] == fork_option:
-            has_vm_tests = True
-            forks_to_test = [fork]
-            break
-    if not has_vm_tests:
-        forks_to_test = []
-else:
-    # If no --fork option, generate tests for all forks
-    forks_to_test = FORKS

tests/json_infra/vm/test_arithmetic_operations.py

@@ -4,13 +4,14 @@
 
 from .. import TEST_FIXTURES
 from ..helpers.load_vm_tests import VmTestLoader
-from . import forks_to_test
+from . import FORKS
 
 ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"]
 TEST_DIR = f"{ETHEREUM_TESTS_PATH}/LegacyTests/Constantinople/VMTests/vmArithmeticTest"
 
 
-@pytest.mark.parametrize("fork", forks_to_test)
+@pytest.mark.vm_test
+@pytest.mark.parametrize("fork", FORKS)
 @pytest.mark.parametrize(
     "test_file",
     [
@@ -28,7 +29,8 @@ def test_add(fork: Tuple[str, str], test_file: str) -> None:
     )
 
 
-@pytest.mark.parametrize("fork", forks_to_test)
+@pytest.mark.vm_test
+@pytest.mark.parametrize("fork", FORKS)
 @pytest.mark.parametrize(
     "test_file",
     [
@@ -46,7 +48,8 @@ def test_sub(fork: Tuple[str, str], test_file: str) -> None:
     )
 
 
-@pytest.mark.parametrize("fork", forks_to_test)
+@pytest.mark.vm_test
+@pytest.mark.parametrize("fork", FORKS)
 @pytest.mark.parametrize(
     "test_file",
     [
@@ -67,7 +70,8 @@ def test_mul(fork: Tuple[str, str], test_file: str) -> None:
     )
 
 
-@pytest.mark.parametrize("fork", forks_to_test)
+@pytest.mark.vm_test
+@pytest.mark.parametrize("fork", FORKS)
 @pytest.mark.parametrize(
     "test_file",
     [
@@ -88,7 +92,8 @@ def test_div(fork: Tuple[str, str], test_file: str) -> None:
     )
 
 
-@pytest.mark.parametrize("fork", forks_to_test)
+@pytest.mark.vm_test
+@pytest.mark.parametrize("fork", FORKS)
 @pytest.mark.parametrize(
     "test_file",
     [
@@ -118,7 +123,8 @@ def test_sdiv(fork: Tuple[str, str], test_file: str) -> None:
     )
 
 
-@pytest.mark.parametrize("fork", forks_to_test)
+@pytest.mark.vm_test
+@pytest.mark.parametrize("fork", FORKS)
 @pytest.mark.parametrize(
     "test_file",
     [
@@ -137,7 +143,8 @@ def test_mod(fork: Tuple[str, str], test_file: str) -> None:
     )
 
 
-@pytest.mark.parametrize("fork", forks_to_test)
+@pytest.mark.vm_test
+@pytest.mark.parametrize("fork", FORKS)
 @pytest.mark.parametrize(
     "test_file",
     [
@@ -161,7 +168,8 @@ def test_smod(fork: Tuple[str, str], test_file: str) -> None:
     )
 
 
-@pytest.mark.parametrize("fork", forks_to_test)
+@pytest.mark.vm_test
+@pytest.mark.parametrize("fork", FORKS)
 @pytest.mark.parametrize(
     "test_file",
     [
@@ -185,7 +193,8 @@ def test_addmod(fork: Tuple[str, str], test_file: str) -> None:
     )
 
 
-@pytest.mark.parametrize("fork", forks_to_test)
+@pytest.mark.vm_test
+@pytest.mark.parametrize("fork", FORKS)
 @pytest.mark.parametrize(
     "test_file",
     [
@@ -210,7 +219,8 @@ def test_mulmod(fork: Tuple[str, str], test_file: str) -> None:
     )
 
 
-@pytest.mark.parametrize("fork", forks_to_test)
+@pytest.mark.vm_test
+@pytest.mark.parametrize("fork", FORKS)
 @pytest.mark.parametrize(
     "test_file",
     [
@@ -235,7 +245,8 @@ def test_exp(fork: Tuple[str, str], test_file: str) -> None:
     )
 
 
-@pytest.mark.parametrize("fork", forks_to_test)
+@pytest.mark.vm_test
+@pytest.mark.parametrize("fork", FORKS)
 @pytest.mark.parametrize("exponent", ([2, 4, 8, 16, 32, 64, 128, 256]))
 def test_exp_power_2(fork: Tuple[str, str], exponent: int) -> None:
     VmTestLoader(*fork).run_test(
@@ -245,7 +256,8 @@ def test_exp_power_2(fork: Tuple[str, str], exponent: int) -> None:
     )
 
 
-@pytest.mark.parametrize("fork", forks_to_test)
+@pytest.mark.vm_test
+@pytest.mark.parametrize("fork", FORKS)
 def test_exp_power_256(fork: Tuple[str, str]) -> None:
     for i in range(1, 34):
         VmTestLoader(*fork).run_test(
@@ -262,7 +274,8 @@ def test_exp_power_256(fork: Tuple[str, str]) -> None:
         )
 
 
-@pytest.mark.parametrize("fork", forks_to_test)
+@pytest.mark.vm_test
+@pytest.mark.parametrize("fork", FORKS)
 @pytest.mark.parametrize(
     "test_file",
     [
@@ -288,7 +301,8 @@ def test_signextend(fork: Tuple[str, str], test_file: str) -> None:
     )
 
 
-@pytest.mark.parametrize("fork", forks_to_test)
+@pytest.mark.vm_test
+@pytest.mark.parametrize("fork", FORKS)
 def test_stop(fork: Tuple[str, str]) -> None:
     VmTestLoader(*fork).run_test(
         TEST_DIR,