feat: Async fixture wrappers determine the event loop scope dynamically, rather than relying on event_loop_id_mapping.

Author: seifertm

pytest_asyncio/plugin.py

@@ -352,20 +352,27 @@ def _wrap_asyncgen_fixture(
 ) -> None:
     fixture = fixturedef.func
 
-    event_loop_id_mapping = getattr(fixture, "_event_loop_id_mapping", {})
-    event_loop_id_mapping[event_loop_fixture_name] = event_loop_fixture_id
-    event_loop_id_mapping["function"] = event_loop_fixture_id
-
     if getattr(fixture, "_async_fixture", False):
         return fixture
 
     @functools.wraps(fixture)
     def _asyncgen_fixture_wrapper(request: FixtureRequest, **kwargs: Any):
         unittest = fixturedef.unittest if hasattr(fixturedef, "unittest") else False
         func = _perhaps_rebind_fixture_func(fixture, request.instance, unittest)
-        event_loop_fixture_id = event_loop_id_mapping.get(
-            request.node.name, event_loop_id_mapping["function"]
+        default_loop_scope = request.config.getini("asyncio_default_fixture_loop_scope")
+        loop_scope = (
+            getattr(func, "_loop_scope", None) or default_loop_scope or request.scope
         )
+        if loop_scope == "function":
+            event_loop_fixture_id = "event_loop"
+        else:
+            event_loop_node = _retrieve_scope_root(request._pyfuncitem, loop_scope)
+            event_loop_fixture_id = event_loop_node.stash.get(
+                # Type ignored because of non-optimal mypy inference.
+                _event_loop_fixture_id,  # type: ignore[arg-type]
+                "",
+            )
+        assert event_loop_fixture_id
         event_loop = request.getfixturevalue(event_loop_fixture_id)
         kwargs.pop(event_loop_fixture_id, None)
         gen_obj = func(**_add_kwargs(func, kwargs, event_loop, request))
@@ -393,7 +400,6 @@ async def async_finalizer() -> None:
         request.addfinalizer(finalizer)
         return result
 
-    setattr(_asyncgen_fixture_wrapper, "_event_loop_id_mapping", event_loop_id_mapping)
     setattr(_asyncgen_fixture_wrapper, "_async_fixture", True)
 
     fixturedef.func = _asyncgen_fixture_wrapper
@@ -404,21 +410,27 @@ def _wrap_async_fixture(
 ) -> None:
     fixture = fixturedef.func
 
-    event_loop_id_mapping = getattr(fixture, "_event_loop_id_mapping", {})
-    event_loop_id_mapping[event_loop_fixture_name] = event_loop_fixture_id
-    event_loop_id_mapping["function"] = event_loop_fixture_id
-    print(fixturedef, event_loop_id_mapping)
-
     if getattr(fixture, "_async_fixture", False):
         return fixture
 
     @functools.wraps(fixture)
     def _async_fixture_wrapper(request: FixtureRequest, **kwargs: Any):
         unittest = False if pytest.version_tuple >= (8, 2) else fixturedef.unittest
         func = _perhaps_rebind_fixture_func(fixture, request.instance, unittest)
-        event_loop_fixture_id = event_loop_id_mapping.get(
-            request.node.name, event_loop_id_mapping["function"]
+        default_loop_scope = request.config.getini("asyncio_default_fixture_loop_scope")
+        loop_scope = (
+            getattr(func, "_loop_scope", None) or default_loop_scope or request.scope
         )
+        if loop_scope == "function":
+            event_loop_fixture_id = "event_loop"
+        else:
+            event_loop_node = _retrieve_scope_root(request._pyfuncitem, loop_scope)
+            event_loop_fixture_id = event_loop_node.stash.get(
+                # Type ignored because of non-optimal mypy inference.
+                _event_loop_fixture_id,  # type: ignore[arg-type]
+                "",
+            )
+        assert event_loop_fixture_id
         event_loop = request.getfixturevalue(event_loop_fixture_id)
         kwargs.pop(event_loop_fixture_id, None)
 
@@ -428,7 +440,6 @@ async def setup():
 
         return event_loop.run_until_complete(setup())
 
-    setattr(_async_fixture_wrapper, "_event_loop_id_mapping", event_loop_id_mapping)
     setattr(_async_fixture_wrapper, "_async_fixture", True)
 
     fixturedef.func = _async_fixture_wrapper