Merge branch 'optimize-test-collection' into benchmark_v0.0.3

Author: marioevz

src/pytest_plugins/execute/execute.py

@@ -349,25 +349,28 @@ def pytest_generate_tests(metafunc: pytest.Metafunc):
 
 def pytest_collection_modifyitems(config: pytest.Config, items: List[pytest.Item]):
     """Remove transition tests and add the appropriate execute markers to the test."""
-    for item in items[:]:  # use a copy of the list, as we'll be modifying it
+    i = 0
+    while i < len(items):
+        item = items[i]
         if isinstance(item, EIPSpecTestItem):
             continue
         params: Dict[str, Any] = item.callspec.params  # type: ignore
         if "fork" not in params or params["fork"] is None:
-            items.remove(item)
+            items.pop(i)
             continue
         fork: Fork = params["fork"]
         spec_type, execute_format = get_spec_format_for_item(params)
         assert issubclass(execute_format, BaseExecute)
         markers = list(item.iter_markers())
         if spec_type.discard_execute_format_by_marks(execute_format, fork, markers):
-            items.remove(item)
+            items.pop(i)
             continue
         for marker in markers:
             if marker.name == "execute":
                 for mark in marker.args:
                     item.add_marker(mark)
             elif marker.name == "valid_at_transition_to":
-                items.remove(item)
+                items.pop(i)
         if "yul" in item.fixturenames:  # type: ignore
             item.add_marker(pytest.mark.yul_test)
+        i += 1

src/pytest_plugins/filler/filler.py

@@ -1106,27 +1106,29 @@ def pytest_collection_modifyitems(
     These can't be handled in this plugins pytest_generate_tests() as the fork
     parametrization occurs in the forks plugin.
     """
-    for item in items[:]:  # use a copy of the list, as we'll be modifying it
+    i = 0
+    while i < len(items):
+        item = items[i]
         params: Dict[str, Any] | None = None
         if isinstance(item, pytest.Function):
             params = item.callspec.params
         elif hasattr(item, "params"):
             params = item.params
         if not params or "fork" not in params or params["fork"] is None:
-            items.remove(item)
+            items.pop(i)
             continue
         fork: Fork = params["fork"]
         spec_type, fixture_format = get_spec_format_for_item(params)
         if isinstance(fixture_format, NotSetType):
-            items.remove(item)
+            items.pop(i)
             continue
         assert issubclass(fixture_format, BaseFixture)
         if not fixture_format.supports_fork(fork):
-            items.remove(item)
+            items.pop(i)
             continue
         markers = list(item.iter_markers())
         if spec_type.discard_fixture_format_by_marks(fixture_format, fork, markers):
-            items.remove(item)
+            items.pop(i)
             continue
         for marker in markers:
             if marker.name == "fill":
@@ -1147,6 +1149,7 @@ def pytest_collection_modifyitems(
                     f"fork_{fork.name()}",
                     f"fork_{base_fork.name()}",
                 )
+        i += 1
 
 
 def pytest_sessionfinish(session: pytest.Session, exitstatus: int):