Merge pull request #17 from chrisoaks/support-indirect-parameterization

Support indirect parameterization

Author: willemt

pytest_asyncio_cooperative/fixtures.py

@@ -15,12 +15,15 @@ def function_args(func):
 def _get_fixture(item, arg_name, fixture=None):
     """
     Sometimes fixture names clash with plugin fixtures.
-    We priortise fixtures that are defined inside the user's module
+    We prioritise fixtures that are defined inside the user's module
     """
     if arg_name == "request":
         # Support parameterized fixture
-        if fixture and fixture.params:
-            item._request.param = item._pyfuncitem.callspec.params[fixture.argname]
+        if fixture:
+            try:
+                item._request.param = item._pyfuncitem.callspec.params[fixture.argname]
+            except AttributeError as e:
+                pass
         return item._request
 
     if arg_name == "self":

pytest_asyncio_cooperative/plugin.py

@@ -304,20 +304,21 @@ async def run_tests(tasks, max_tasks):
         activate_assert_rewrite(item)
 
     # Run the tests using cooperative multitasking
-    _run_test_loop(tasks, session, run_tests)
-
-    # Run failed flakey tests
-    if flakes_to_retry:
-        _run_test_loop(flakes_to_retry, session, run_tests)
-
-    # Run synchronous tests
-    session.items = regular_items
-    for i, item in enumerate(session.items):
-        nextitem = session.items[i + 1] if i + 1 < len(session.items) else None
-        item.config.hook.pytest_runtest_protocol(item=item, nextitem=nextitem)
-        if session.shouldfail:
-            raise session.Failed(session.shouldfail)
-        if session.shouldstop:
-            raise session.Interrupted(session.shouldstop)
-
-    return True
+    if not previous_collectonly:
+        _run_test_loop(tasks, session, run_tests)
+
+        # Run failed flakey tests
+        if flakes_to_retry:
+            _run_test_loop(flakes_to_retry, session, run_tests)
+
+        # Run synchronous tests
+        session.items = regular_items
+        for i, item in enumerate(session.items):
+            nextitem = session.items[i + 1] if i + 1 < len(session.items) else None
+            item.config.hook.pytest_runtest_protocol(item=item, nextitem=nextitem)
+            if session.shouldfail:
+                raise session.Failed(session.shouldfail)
+            if session.shouldstop:
+                raise session.Interrupted(session.shouldstop)
+
+        return True

tests/test_fixture.py

@@ -95,6 +95,29 @@ async def test_a(tmp_path):
     result.assert_outcomes(passed=1)
 
 
+def test_indirect(testdir):
+    testdir.makepyfile(
+        """
+        import asyncio
+        import pytest
+        @pytest.fixture
+        def to_str(request):
+            yield str(request.param)
+        
+
+        @pytest.mark.asyncio_cooperative
+        @pytest.mark.parametrize("to_str, expected", [(1, "1"), (2, "2"), (3, "3")], indirect=[
+        "to_str"])
+        async def test_a(to_str, expected):
+            await asyncio.sleep(2)
+            assert to_str == expected
+    """
+    )
+
+    result = testdir.runpytest()
+    result.assert_outcomes(passed=3)
+
+
 def test_fixtures(testdir):
     testdir.makeconftest("""""")