Do not suppress pytest.exit() or keyboard interrupt when working with pdb

Author: nicoddemus

src/_pytest/runner.py

@@ -16,6 +16,7 @@
 from typing import TYPE_CHECKING
 from typing import TypeVar
 
+from .config import Config
 from .reports import BaseReport
 from .reports import CollectErrorRepr
 from .reports import CollectReport
@@ -239,11 +240,11 @@ def call_and_report(
         runtest_hook = ihook.pytest_runtest_teardown
     else:
         assert False, f"Unhandled runtest hook case: {when}"
-    reraise: tuple[type[BaseException], ...] = (Exit,)
-    if not item.config.getoption("usepdb", False):
-        reraise += (KeyboardInterrupt,)
+
     call = CallInfo.from_call(
-        lambda: runtest_hook(item=item, **kwds), when=when, reraise=reraise
+        lambda: runtest_hook(item=item, **kwds),
+        when=when,
+        reraise=get_reraise_exceptions(item.config),
     )
     report: TestReport = ihook.pytest_runtest_makereport(item=item, call=call)
     if log:
@@ -253,6 +254,14 @@ def call_and_report(
     return report
 
 
+def get_reraise_exceptions(config: Config) -> tuple[type[BaseException], ...]:
+    """Return exception types that should not be suppressed in general."""
+    reraise: tuple[type[BaseException], ...] = (Exit,)
+    if not config.getoption("usepdb", False):
+        reraise += (KeyboardInterrupt,)
+    return reraise
+
+
 def check_interactive_exception(call: CallInfo[object], report: BaseReport) -> bool:
     """Check whether the call raised an exception that should be reported as
     interactive."""

src/_pytest/subtests.py

@@ -34,6 +34,7 @@
 from _pytest.reports import TestReport
 from _pytest.runner import CallInfo
 from _pytest.runner import check_interactive_exception
+from _pytest.runner import get_reraise_exceptions
 from _pytest.stash import StashKey
 
 
@@ -276,6 +277,8 @@ def __exit__(
             )
 
         if exc_val is not None:
+            if isinstance(exc_val, get_reraise_exceptions(self.config)):
+                return False
             if self.request.session.shouldfail:
                 return False
         return True

testing/test_subtests.py

@@ -931,3 +931,23 @@ def test_foo(subtests):
         consecutive=True,
     )
     result.stdout.no_fnmatch_line("*sub2*")  # sub2 not executed.
+
+
+def test_do_not_swallow_pytest_exit(pytester: pytest.Pytester) -> None:
+    pytester.makepyfile(
+        """
+        import pytest
+        def test(subtests):
+            with subtests.test():
+                pytest.exit()
+
+        def test2(): pass
+        """
+    )
+    result = pytester.runpytest_subprocess()
+    result.stdout.fnmatch_lines(
+        [
+            "* _pytest.outcomes.Exit *",
+            "* 1 failed in *",
+        ]
+    )