Merge branch 'forks/amsterdam' into projects/zkevm

Author: jsign

packages/testing/src/execution_testing/cli/pytest_commands/base.py

@@ -35,6 +35,11 @@ class PytestExecution:
     description: Optional[str] = None
     """Optional description for this execution phase."""
 
+    allowed_exit_codes: List[pytest.ExitCode] = field(
+        default_factory=lambda: [pytest.ExitCode.OK]
+    )
+    """Exit codes treated as successful for this execution."""
+
 
 class ArgumentProcessor(ABC):
     """Base class for processing command-line arguments."""
@@ -99,7 +104,7 @@ def run_multiple(self, executions: List[PytestExecution]) -> int:
                 sys.stderr.flush()
 
             result = self.run_single(execution)
-            if result != 0:
+            if result not in execution.allowed_exit_codes:
                 return result
 
         return 0

packages/testing/src/execution_testing/cli/pytest_commands/fill.py

@@ -3,6 +3,7 @@
 from typing import Any, List
 
 import click
+import pytest
 
 from .base import PytestCommand, PytestExecution, common_pytest_options
 from .processors import (
@@ -80,6 +81,10 @@ def _create_two_phase_executions(
                 config_file=self.config_path,
                 args=phase1_args,
                 description="generating pre-allocation groups",
+                allowed_exit_codes=[
+                    pytest.ExitCode.OK,
+                    pytest.ExitCode.NO_TESTS_COLLECTED,
+                ],
             ),
             PytestExecution(
                 config_file=self.config_path,