Remove use of MultiError

Author: Zac-HD

newsfragments/128.misc.rst

@@ -0,0 +1,4 @@
+Trio 0.22.0 deprecated ``MultiError`` in favor of the standard-library
+(or `backported <https://pypi.org/project/exceptiongroup/>`__) ``ExceptionGroup``
+type; ``pytest-trio`` now uses ``ExceptionGroup`` and therefore requires
+Trio 0.22.0 or later.

pytest_trio/_tests/test_async_yield_fixture.py

@@ -300,4 +300,6 @@ def test_after():
     result = testdir.runpytest()
 
     result.assert_outcomes(failed=1, passed=2)
-    result.stdout.re_match_lines([r"E\W+RuntimeError: Crash during fixture teardown"])
+    result.stdout.re_match_lines(
+        [r"(E\W+| +\| )RuntimeError: Crash during fixture teardown"]
+    )

pytest_trio/_tests/test_sync_fixture.py

@@ -139,4 +139,6 @@ def test_after():
     result = testdir.runpytest()
 
     result.assert_outcomes(failed=1, passed=2)
-    result.stdout.re_match_lines([r"E\W+RuntimeError: Crash during fixture teardown"])
+    result.stdout.re_match_lines(
+        [r"(E\W+| +\| )RuntimeError: Crash during fixture teardown"]
+    )

pytest_trio/plugin.py

@@ -1,6 +1,6 @@
 """pytest-trio implementation."""
+import sys
 from functools import wraps, partial
-from traceback import format_exception
 from collections.abc import Coroutine, Generator
 from contextlib import asynccontextmanager
 from inspect import isasyncgen, isasyncgenfunction, iscoroutinefunction
@@ -11,6 +11,9 @@
 from trio.abc import Clock, Instrument
 from trio.testing import MockClock
 
+if sys.version_info[:2] < (3, 11):
+    from exceptiongroup import BaseExceptionGroup
+
 ################################################################
 # Basic setup
 ################################################################
@@ -52,13 +55,6 @@ def pytest_configure(config):
     )
 
 
-@pytest.hookimpl(tryfirst=True)
-def pytest_exception_interact(node, call, report):
-    if issubclass(call.excinfo.type, trio.MultiError):
-        # TODO: not really elegant (pytest cannot output color with this hack)
-        report.longrepr = "".join(format_exception(*call.excinfo._excinfo))
-
-
 ################################################################
 # Core support for trio fixtures and trio tests
 ################################################################
@@ -407,8 +403,12 @@ async def _bootstrap_fixtures_and_run_test(**kwargs):
                     )
                 )
 
-        if test_ctx.error_list:
-            raise trio.MultiError(test_ctx.error_list)
+        if len(test_ctx.error_list) == 1:
+            raise test_ctx.error_list[0]
+        elif test_ctx.error_list:
+            raise BaseExceptionGroup(
+                "errors in async test and trio fixtures", test_ctx.error_list
+            )
 
     _bootstrap_fixtures_and_run_test._trio_test_runner_wrapped = True
     return _bootstrap_fixtures_and_run_test