Support strict_exception_groups with timeouts

Author: VincentVanlaer

pytest_trio/plugin.py

@@ -12,8 +12,13 @@
 from trio.abc import Clock, Instrument
 from trio.testing import MockClock
 from _pytest.outcomes import Skipped, XFailed
+
 # pytest_timeout_set_timer needs to be imported here for pluggy
-from .timeout import set_timeout, pytest_timeout_set_timer as pytest_timeout_set_timer
+from .timeout import (
+    set_timeout,
+    TimeoutTriggeredException,
+    pytest_timeout_set_timer as pytest_timeout_set_timer,
+)
 
 if sys.version_info[:2] < (3, 11):
     from exceptiongroup import BaseExceptionGroup
@@ -362,6 +367,8 @@ def wrapper(**kwargs):
                     ex = queue.pop()
                     if isinstance(ex, BaseExceptionGroup):
                         queue.extend(ex.exceptions)
+                    elif isinstance(ex, TimeoutTriggeredException):
+                        pytest.fail(str(ex), pytrace=False)
                     else:
                         leaves.append(ex)
                 if len(leaves) == 1:
@@ -372,6 +379,8 @@ def wrapper(**kwargs):
                 # Since our leaf exceptions don't consist of exactly one 'magic'
                 # skipped or xfailed exception, re-raise the whole group.
                 raise
+            except TimeoutTriggeredException as ex:
+                pytest.fail(str(ex), pytrace=False)
 
         return wrapper
 

pytest_trio/timeout.py

@@ -50,6 +50,10 @@ def pytest_timeout_set_timer(
 # No need for pytest_timeout_cancel_timer as we detect that the test loop has exited
 
 
+class TimeoutTriggeredException(Exception):
+    pass
+
+
 def trio_timeout_thread():
     async def run_timeouts():
         async with trio.open_nursery() as nursery:
@@ -89,7 +93,7 @@ async def execute_timeout() -> None:
     stack = "\n".join(format_recursive_nursery_stack(nursery) + ["Timeout reached"])
 
     async def report():
-        pytest.fail(stack, pytrace=False)
+        raise TimeoutTriggeredException(stack)
 
     nursery.start_soon(report)