feat: Tests using package or class loop scopes no longer raise an error when there's no surrounding package or class.

Author: seifertm

changelog.d/+bd8f0ee6.changed.rst

@@ -0,0 +1 @@
+The *loop_scope* argument to ``pytest.mark.asyncio`` no longer forces that a pytest Collector exists at the level of the specified scope. For example, a test function marked with ``pytest.mark.asyncio(loop_scope="class")`` no longer requires a class surrounding the test. This is consistent with the behavior of the *scope* argument to ``pytest_asyncio.fixture``.

docs/reference/markers/index.rst

@@ -27,15 +27,11 @@ The following code example provides a shared event loop for all tests in `TestCl
 .. include:: class_scoped_loop_strict_mode_example.py
     :code: python
 
-If you request class scope for a test that is not part of a class, it will result in a *UsageError*.
 Similar to class-scoped event loops, a module-scoped loop is provided when setting mark's scope to *module:*
 
 .. include:: module_scoped_loop_strict_mode_example.py
     :code: python
 
-Package-scoped loops only work with `regular Python packages. <https://docs.python.org/3/glossary.html#term-regular-package>`__
-That means they require an *__init__.py* to be present.
-Package-scoped loops do not work in `namespace packages. <https://docs.python.org/3/glossary.html#term-namespace-package>`__
 Subpackages do not share the loop with their parent package.
 
 Tests marked with *session* scope share the same event loop, even if the tests exist in different packages.

pytest_asyncio/plugin.py

@@ -687,29 +687,26 @@ def pytest_generate_tests(metafunc: Metafunc) -> None:
     if not marker:
         return
     default_loop_scope = _get_default_test_loop_scope(metafunc.config)
-    scope = _get_marked_loop_scope(marker, default_loop_scope)
-    if scope == "function":
+    loop_scope = _get_marked_loop_scope(marker, default_loop_scope)
+    if loop_scope == "function":
         return
-    event_loop_node = _retrieve_scope_root(metafunc.definition, scope)
-    event_loop_fixture_id = event_loop_node.stash.get(_event_loop_fixture_id, None)
-
-    if event_loop_fixture_id:
-        # This specific fixture name may already be in metafunc.argnames, if this
-        # test indirectly depends on the fixture. For example, this is the case
-        # when the test depends on an async fixture, both of which share the same
-        # event loop fixture mark.
-        if event_loop_fixture_id in metafunc.fixturenames:
-            return
-        fixturemanager = metafunc.config.pluginmanager.get_plugin("funcmanage")
-        assert fixturemanager is not None
-        # Add the scoped event loop fixture to Metafunc's list of fixture names and
-        # fixturedefs and leave the actual parametrization to pytest
-        # The fixture needs to be appended to avoid messing up the fixture evaluation
-        # order
-        metafunc.fixturenames.append(event_loop_fixture_id)
-        metafunc._arg2fixturedefs[event_loop_fixture_id] = (
-            fixturemanager._arg2fixturedefs[event_loop_fixture_id]
-        )
+    event_loop_fixture_id = f"_{loop_scope}_event_loop"
+    # This specific fixture name may already be in metafunc.argnames, if this
+    # test indirectly depends on the fixture. For example, this is the case
+    # when the test depends on an async fixture, both of which share the same
+    # event loop fixture mark.
+    if event_loop_fixture_id in metafunc.fixturenames:
+        return
+    fixturemanager = metafunc.config.pluginmanager.get_plugin("funcmanage")
+    assert fixturemanager is not None
+    # Add the scoped event loop fixture to Metafunc's list of fixture names and
+    # fixturedefs and leave the actual parametrization to pytest
+    # The fixture needs to be appended to avoid messing up the fixture evaluation
+    # order
+    metafunc.fixturenames.append(event_loop_fixture_id)
+    metafunc._arg2fixturedefs[event_loop_fixture_id] = fixturemanager._arg2fixturedefs[
+        event_loop_fixture_id
+    ]
 
 
 def _get_event_loop_no_warn(

tests/markers/test_class_scope.py

@@ -82,29 +82,6 @@ async def test_this_runs_in_same_loop(self):
     result.assert_outcomes(passed=2)
 
 
-def test_asyncio_mark_raises_when_class_scoped_is_request_without_class(
-    pytester: pytest.Pytester,
-):
-    pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
-    pytester.makepyfile(
-        dedent(
-            """\
-            import asyncio
-            import pytest
-
-            @pytest.mark.asyncio(loop_scope="class")
-            async def test_has_no_surrounding_class():
-                pass
-            """
-        )
-    )
-    result = pytester.runpytest("--asyncio-mode=strict")
-    result.assert_outcomes(errors=1)
-    result.stdout.fnmatch_lines(
-        "*is marked to be run in an event loop with scope*",
-    )
-
-
 def test_asyncio_mark_is_inherited_to_subclasses(pytester: pytest.Pytester):
     pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
     pytester.makepyfile(

tests/markers/test_package_scope.py

@@ -339,23 +339,3 @@ async def test_does_not_fail(sets_event_loop_to_none, n):
     )
     result = pytester.runpytest("--asyncio-mode=strict")
     result.assert_outcomes(passed=2)
-
-
-def test_standalone_test_does_not_trigger_warning_about_no_current_event_loop_being_set(
-    pytester: Pytester,
-):
-    pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
-    pytester.makepyfile(
-        __init__="",
-        test_module=dedent(
-            """\
-            import pytest
-
-            @pytest.mark.asyncio(loop_scope="package")
-            async def test_anything():
-                pass
-            """
-        ),
-    )
-    result = pytester.runpytest_subprocess("--asyncio-mode=strict")
-    result.assert_outcomes(warnings=0, passed=1)