Revert "[feat!] Async fixtures can no longer request the *event_loop* fixture."

This reverts commit 201f6ec.

Author: seifertm

docs/source/reference/changelog.rst

@@ -2,10 +2,6 @@
 Changelog
 =========
 
-0.23.0 (UNRELEASED)
-===================
-- BREAKING: Async fixtures can no longer request the *event_loop* fixture. Use *asyncio.get_running_loop()* instead.
-
 0.22.0 (2023-10-31)
 ===================
 - Class-scoped and module-scoped event loops can be requested

pytest_asyncio/plugin.py

@@ -269,12 +269,16 @@ def _synchronize_async_fixture(
 def _add_kwargs(
     func: Callable[..., Any],
     kwargs: Dict[str, Any],
+    event_loop_fixture_id: str,
+    event_loop: asyncio.AbstractEventLoop,
     request: SubRequest,
 ) -> Dict[str, Any]:
     sig = inspect.signature(func)
     ret = kwargs.copy()
     if "request" in sig.parameters:
         ret["request"] = request
+    if event_loop_fixture_id in sig.parameters:
+        ret[event_loop_fixture_id] = event_loop
     return ret
 
 
@@ -305,9 +309,10 @@ def _asyncgen_fixture_wrapper(request: SubRequest, **kwargs: Any):
         func = _perhaps_rebind_fixture_func(
             fixture, request.instance, fixturedef.unittest
         )
-        kwargs.pop(event_loop_fixture_id)
-        event_loop = asyncio.get_event_loop()
-        gen_obj = func(**_add_kwargs(func, kwargs, request))
+        event_loop = kwargs.pop(event_loop_fixture_id)
+        gen_obj = func(
+            **_add_kwargs(func, kwargs, event_loop_fixture_id, event_loop, request)
+        )
 
         async def setup():
             res = await gen_obj.__anext__()
@@ -343,11 +348,12 @@ def _async_fixture_wrapper(request: SubRequest, **kwargs: Any):
         func = _perhaps_rebind_fixture_func(
             fixture, request.instance, fixturedef.unittest
         )
-        kwargs.pop(event_loop_fixture_id)
-        event_loop = asyncio.get_event_loop()
+        event_loop = kwargs.pop(event_loop_fixture_id)
 
         async def setup():
-            res = await func(**_add_kwargs(func, kwargs, request))
+            res = await func(
+                **_add_kwargs(func, kwargs, event_loop_fixture_id, event_loop, request)
+            )
             return res
 
         return event_loop.run_until_complete(setup())

tests/test_explicit_event_loop_fixture_request.py

@@ -89,7 +89,7 @@ async def test_uses_fixture(emits_warning):
         )
     )
     result = pytester.runpytest("--asyncio-mode=strict")
-    result.assert_outcomes(errors=1, warnings=1)
+    result.assert_outcomes(passed=1, warnings=1)
     result.stdout.fnmatch_lines(
         ['*is asynchronous and explicitly requests the "event_loop" fixture*']
     )
@@ -115,7 +115,7 @@ async def test_uses_fixture(emits_warning):
         )
     )
     result = pytester.runpytest("--asyncio-mode=strict")
-    result.assert_outcomes(errors=1, warnings=1)
+    result.assert_outcomes(passed=1, warnings=1)
     result.stdout.fnmatch_lines(
         ['*is asynchronous and explicitly requests the "event_loop" fixture*']
     )