pytest-asyncio-concurrent 0.2.0__tar.gz → 0.2.2__tar.gz

{pytest_asyncio_concurrent-0.2.0/pytest_asyncio_concurrent.egg-info → pytest_asyncio_concurrent-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pytest-asyncio-concurrent
-Version: 0.2.0
+Version: 0.2.2
 Summary: Pytest plugin to execute python async tests concurrently.
 Author-email: Zane Chen <czl970721@gmail.com>
 Maintainer-email: Zane Chen <czl970721@gmail.com>

{pytest_asyncio_concurrent-0.2.0 → pytest_asyncio_concurrent-0.2.2}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "pytest-asyncio-concurrent"
 description = "Pytest plugin to execute python async tests concurrently."
-version = "0.2.0"
+version = "0.2.2"
 readme = "README.rst"
 requires-python = ">=3.8"
 authors = [
@@ -84,7 +84,7 @@ concurrency = [
 show_missing = true
 
 [tool.bumpversion]
-current_version = "0.2.0"
+current_version = "0.2.2"
 parse = """(?x)
   (?P<major>0|[1-9]\\d*)\\.
   (?P<minor>0|[1-9]\\d*)\\.

{pytest_asyncio_concurrent-0.2.0 → pytest_asyncio_concurrent-0.2.2}/pytest_asyncio_concurrent/plugin.py

@@ -1,8 +1,10 @@
 import asyncio
+import functools
 import inspect
 import uuid
 import warnings
 import sys
+import contextlib
 
 from typing import (
     Any,
@@ -15,12 +17,13 @@ from typing import (
     Dict,
     Sequence,
     Union,
+    ContextManager,
 )
 
+import pluggy
 import pytest
 from _pytest import timing
 from _pytest import outcomes
-from _pytest import warnings as pytest_warnings
 
 from .grouping import (
     AsyncioConcurrentGroup,
@@ -187,37 +190,27 @@ def pytest_runtest_protocol_async_group(
             )
         )
 
-    children_passed_setup: List[pytest.Function] = []
+    item_passed_setup: List[AsyncioConcurrentGroupMember] = []
+    coros: List[Coroutine] = []
+    loop = asyncio.get_event_loop()
 
     for childFunc in group.children:
         childFunc.ihook.pytest_runtest_logstart(
             nodeid=childFunc.nodeid, location=childFunc.location
         )
 
-    for childFunc in group.children:
-        # bundle group setup with test setup until it pass
-        # (which should either pass on first item, or fail all the way till end)
-        report = _call_and_report(
-            _setup_child(childFunc, with_group=(not group.has_setup)), childFunc, "setup"
-        )
+        report = _call_and_report(_setup_child(childFunc), childFunc, "setup")
+        if report.passed:
+            item_passed_setup.append(childFunc)
 
-        if report.passed and group.has_setup:
-            children_passed_setup.append(childFunc)
-            continue
+    for childFunc in item_passed_setup:
+        coros.append(_call_and_report_runtest_async(childFunc))
 
-    _pytest_runtest_call_and_report_async_group(children_passed_setup)
-
-    for i, childFunc in enumerate(group.children):
-        # teardown group with the last test.
-        _call_and_report(
-            _teardown_child(
-                childFunc, nextgroup=nextgroup, with_group=(i == len(group.children) - 1)
-            ),
-            childFunc,
-            "teardown",
-        )
+    loop.run_until_complete(asyncio.gather(*coros))
 
     for childFunc in group.children:
+        _call_and_report(_teardown_child(childFunc, nextgroup=nextgroup), childFunc, "teardown")
+
         childFunc.ihook.pytest_runtest_logfinish(
             nodeid=childFunc.nodeid, location=childFunc.location
         )
@@ -225,29 +218,15 @@ def pytest_runtest_protocol_async_group(
     return True
 
 
-def _pytest_runtest_call_and_report_async_group(items: List[pytest.Function]) -> None:
-    def hook_invoker(item: pytest.Function) -> Callable[[], Coroutine]:
-        def inner() -> Coroutine:
-            return childFunc.ihook.pytest_runtest_call_async(item=item)
-
-        return inner
-
-    coros: List[Coroutine] = []
-    loop = asyncio.get_event_loop()
-
-    for childFunc in items:
-        coros.append(_async_callinfo_from_call(hook_invoker(childFunc)))
-
-    call_result = loop.run_until_complete(asyncio.gather(*coros))
-
-    for childFunc, call in zip(items, call_result):
-        report = childFunc.ihook.pytest_runtest_makereport(item=childFunc, call=call)
-        childFunc.ihook.pytest_runtest_logreport(report=report)
+async def _call_and_report_runtest_async(item: AsyncioConcurrentGroupMember) -> None:
+    callinfo = await _async_callinfo_from_call(
+        functools.partial(item.ihook.pytest_runtest_call_async, item=item)  # type: ignore
+    )
+    report = item.ihook.pytest_runtest_makereport(item=item, call=callinfo)
+    item.ihook.pytest_runtest_logreport(report=report)
 
 
-def _setup_child(
-    item: AsyncioConcurrentGroupMember, with_group: bool = False
-) -> Callable[[], None]:
+def _setup_child(item: AsyncioConcurrentGroupMember) -> Callable[[], None]:
     """
     Setup flow for normal pytest tests:
     - Push all nodes onto `SetupState`, start from furthest.
@@ -263,7 +242,7 @@ def _setup_child(
     """
 
     def inner() -> None:
-        if with_group:
+        if not item.group.has_setup:
             item.ihook.pytest_runtest_setup_async_group(item=item.group)
 
         item.config.pluginmanager.subset_hook_caller(
@@ -276,7 +255,6 @@ def _setup_child(
 def _teardown_child(
     item: AsyncioConcurrentGroupMember,
     nextgroup: Optional[AsyncioConcurrentGroup],
-    with_group: bool = False,
 ) -> Callable[[], None]:
     """
     Similar to setup.
@@ -300,7 +278,7 @@ def _teardown_child(
             exceptions.append(e)
 
         try:
-            if with_group:
+            if len(item.group.children_finalizer) == 0:
                 item.ihook.pytest_runtest_teardown_async_group(item=item.group, nextitem=nextgroup)
         except Exception as e:
             if isinstance(e, BaseExceptionGroup):
@@ -384,18 +362,54 @@ def pytest_runtest_teardown_handle_async_function(
     item.group.teardown_child(item)
 
 
-# =========================== # warnings #===========================#
+# =========================== # Captures #===========================#
 
 
 @pytest.hookimpl(specname="pytest_runtest_protocol_async_group", wrapper=True, tryfirst=True)
 def pytest_runtest_protocol_async_group_warning(
     group: "AsyncioConcurrentGroup", nextgroup: Optional["AsyncioConcurrentGroup"]
 ) -> Generator[None, object, object]:
-    config = group.children[0].config
-    with pytest_warnings.catch_warnings_for_item(
-        config=config, ihook=group.children[0].ihook, when="runtest", item=None
-    ):
-        return (yield)
+    with_pytest_runtest_protocol_warning = _with_specific_hook_wrapped(
+        group.ihook.pytest_runtest_protocol, "warnings"
+    )
+
+    if with_pytest_runtest_protocol_warning:
+        with with_pytest_runtest_protocol_warning(item=group, nextitem=nextgroup):
+            result = yield
+
+        return result
+
+    return (yield)
+
+
+@pytest.hookimpl(specname="pytest_runtest_call_async", wrapper=True, tryfirst=True)
+def pytest_runtest_call_async_logging(item: pytest.Item) -> Generator[None, object, object]:
+    with_pytest_runtest_call_logging = _with_specific_hook_wrapped(
+        item.ihook.pytest_runtest_call, "logging-plugin"
+    )
+
+    if with_pytest_runtest_call_logging:
+        with with_pytest_runtest_call_logging(item=item):
+            result = yield
+
+        return result
+
+    return (yield)
+
+
+@pytest.hookimpl(specname="pytest_runtest_call_async", wrapper=True, tryfirst=True)
+def pytest_runtest_call_async_capture(item: pytest.Item) -> Generator[None, object, object]:
+    with_pytest_runtest_call_capture = _with_specific_hook_wrapped(
+        item.ihook.pytest_runtest_call, "capturemanager"
+    )
+
+    if with_pytest_runtest_call_capture:
+        with with_pytest_runtest_call_capture(item=item):
+            result = yield
+
+        return result
+
+    return (yield)
 
 
 # =========================== # helper #===========================#
@@ -465,3 +479,25 @@ def _call_and_report(
     ):
         item.ihook.pytest_exception_interact(node=item, call=call, report=report)
     return report
+
+
+def _with_specific_hook_wrapped(
+    hook: pluggy.HookCaller,
+    plugin: str,
+) -> Optional[Callable[..., ContextManager]]:
+    try:
+        hookimpl = next(h for h in hook.get_hookimpls() if h.plugin_name == plugin)
+    except StopIteration:
+        return None
+
+    @contextlib.contextmanager
+    def cm(**kwargs: Dict) -> Generator:
+        gen = hookimpl.function(**{k: v for k, v in kwargs.items() if k in hookimpl.argnames})
+        next(gen)  # type: ignore
+        yield
+        try:
+            next(gen)  # type: ignore
+        except StopIteration:
+            pass
+
+    return cm

{pytest_asyncio_concurrent-0.2.0 → pytest_asyncio_concurrent-0.2.2/pytest_asyncio_concurrent.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pytest-asyncio-concurrent
-Version: 0.2.0
+Version: 0.2.2
 Summary: Pytest plugin to execute python async tests concurrently.
 Author-email: Zane Chen <czl970721@gmail.com>
 Maintainer-email: Zane Chen <czl970721@gmail.com>