refactor: _add_kwargs no longer requires the event loop fixture id.

Author: seifertm

pytest_asyncio/plugin.py

@@ -316,16 +316,15 @@ def _synchronize_async_fixture(
 def _add_kwargs(
     func: Callable[..., Any],
     kwargs: Dict[str, Any],
-    event_loop_fixture_id: str,
     event_loop: asyncio.AbstractEventLoop,
     request: FixtureRequest,
 ) -> 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
+    if "event_loop" in sig.parameters:
+        ret["event_loop"] = event_loop
     return ret
 
 
@@ -369,9 +368,7 @@ def _asyncgen_fixture_wrapper(request: FixtureRequest, **kwargs: Any):
         )
         event_loop = request.getfixturevalue(event_loop_fixture_id)
         kwargs.pop(event_loop_fixture_id, None)
-        gen_obj = func(
-            **_add_kwargs(func, kwargs, event_loop_fixture_id, event_loop, request)
-        )
+        gen_obj = func(**_add_kwargs(func, kwargs, event_loop, request))
 
         async def setup():
             res = await gen_obj.__anext__()
@@ -410,6 +407,7 @@ def _wrap_async_fixture(
     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
@@ -425,9 +423,7 @@ def _async_fixture_wrapper(request: FixtureRequest, **kwargs: Any):
         kwargs.pop(event_loop_fixture_id, None)
 
         async def setup():
-            res = await func(
-                **_add_kwargs(func, kwargs, event_loop_fixture_id, event_loop, request)
-            )
+            res = await func(**_add_kwargs(func, kwargs, event_loop, request))
             return res
 
         return event_loop.run_until_complete(setup())