Compare commits

..

No commits in common. "factory" and "factory" have entirely different histories.

5 changed files with 98 additions and 56 deletions

86
duplicated-markers.patch Normal file
View File

@ -0,0 +1,86 @@
From b646cc18a222c8043433c38a42c07245fe9735ce Mon Sep 17 00:00:00 2001
From: Michael Seifert <m.seifert@digitalernachschub.de>
Date: Sun, 19 May 2024 14:00:57 +0200
Subject: [PATCH] [fix] Fixed a bug that causes markers to be duplicated for
async test functions.
Signed-off-by: Michael Seifert <m.seifert@digitalernachschub.de>
---
docs/source/reference/changelog.rst | 9 ++++++++
pytest_asyncio/plugin.py | 3 ++-
tests/markers/test_function_scope.py | 31 ++++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/docs/source/reference/changelog.rst b/docs/source/reference/changelog.rst
index a55fb9a8..5f0de0a1 100644
--- a/docs/source/reference/changelog.rst
+++ b/docs/source/reference/changelog.rst
@@ -2,6 +2,15 @@
Changelog
=========
+0.23.8 (UNRELEASED)
+===================
+- Fixes a bug that caused duplicate markers in async tests `#813 <https://github.com/pytest-dev/pytest-asyncio/issues/813>`_
+
+Known issues
+------------
+As of v0.23, pytest-asyncio attaches an asyncio event loop to each item of the test suite (i.e. session, packages, modules, classes, functions) and allows tests to be run in those loops when marked accordingly. Pytest-asyncio currently assumes that async fixture scope is correlated with the new event loop scope. This prevents fixtures from being evaluated independently from the event loop scope and breaks some existing test suites (see `#706`_). For example, a test suite may require all fixtures and tests to run in the same event loop, but have async fixtures that are set up and torn down for each module. If you're affected by this issue, please continue using the v0.21 release, until it is resolved.
+
+
0.23.7 (2024-05-19)
===================
- Silence deprecation warnings about unclosed event loops that occurred with certain CPython patch releases `#817 <https://github.com/pytest-dev/pytest-asyncio/pull/817>`_
diff --git a/pytest_asyncio/plugin.py b/pytest_asyncio/plugin.py
index cd4c4ede..d3d1fcf7 100644
--- a/pytest_asyncio/plugin.py
+++ b/pytest_asyncio/plugin.py
@@ -405,7 +405,8 @@ def _from_function(cls, function: Function, /) -> Function:
keywords=function.keywords,
originalname=function.originalname,
)
- subclass_instance.own_markers.extend(function.own_markers)
+ subclass_instance.own_markers = function.own_markers
+ assert subclass_instance.own_markers == function.own_markers
subclassed_function_signature = inspect.signature(subclass_instance.obj)
if "event_loop" in subclassed_function_signature.parameters:
subclass_instance.warn(
diff --git a/tests/markers/test_function_scope.py b/tests/markers/test_function_scope.py
index 2057a128..eded4552 100644
--- a/tests/markers/test_function_scope.py
+++ b/tests/markers/test_function_scope.py
@@ -197,3 +197,34 @@ async def test_anything():
)
result = pytester.runpytest_subprocess("--asyncio-mode=strict")
result.assert_outcomes(warnings=0, passed=1)
+
+
+def test_asyncio_mark_does_not_duplicate_other_marks_in_auto_mode(
+ pytester: Pytester,
+):
+ pytester.makeconftest(
+ dedent(
+ """\
+ def pytest_configure(config):
+ config.addinivalue_line(
+ "markers", "dummy_marker: mark used for testing purposes"
+ )
+ """
+ )
+ )
+ pytester.makepyfile(
+ dedent(
+ """\
+ import pytest
+
+ @pytest.mark.dummy_marker
+ async def test_markers_not_duplicated(request):
+ markers = []
+ for node, marker in request.node.iter_markers_with_node():
+ markers.append(marker)
+ assert len(markers) == 2
+ """
+ )
+ )
+ result = pytester.runpytest_subprocess("--asyncio-mode=auto")
+ result.assert_outcomes(warnings=0, passed=1)

BIN
pytest-asyncio-0.23.7.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e804b2a165f28f2a552e73e8ae2efd01f766d58510766dd6dd03be54583cd75
size 52116

View File

@ -1,53 +1,3 @@
-------------------------------------------------------------------
Wed Mar 5 12:37:11 UTC 2025 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
- update to 0.25.3:
* Avoid errors in cleanup of async generators when event loop is
already closed #1040
- update to 0.25.2:
* Call loop.shutdown_asyncgens() before closing the event loop to
ensure async generators are closed in the same manner as
asyncio.run does #1034
-------------------------------------------------------------------
Fri Jan 3 09:12:39 UTC 2025 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
- update to 0.25.1:
* Fixes an issue that caused a broken event loop when a
function-scoped test was executed in between two tests with
wider loop scope #950
* Improves test collection speed in auto mode #1020
* Corrects the warning that is emitted upon redefining the
event_loop fixture
-------------------------------------------------------------------
Fri Jan 3 09:10:08 UTC 2025 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
- Update to 0.25.0:
* Deprecated: Added warning when asyncio test requests async
@pytest.fixture in strict mode. This will become an error in a
future version of flake8-asyncio. #979
* Updates the error message about pytest.mark.asyncio's scope
keyword argument to say loop_scope instead. #1004
* Verbose log displays correct parameter name:
asyncio_default_fixture_loop_scope #990
* Propagates contextvars set in async fixtures to other fixtures
and tests on Python 3.11 and above. #1008
-------------------------------------------------------------------
Tue Oct 8 15:42:52 UTC 2024 - Markéta Machová <mmachova@suse.com>
- Update to 0.24.0
* BREAKING: Updated minimum supported pytest version to v8.2.0
* Adds an optional loop_scope keyword argument to pytest.mark.asyncio.
* Deprecates the optional scope keyword argument to pytest.mark.asyncio
for API consistency with pytest_asyncio.fixture.
* Fixes a bug that caused module-scoped async fixtures to fail when
reused in other modules
* Fixes a bug that caused duplicate markers in async tests
* Declare support for Python 3.13
- Drop merged duplicated-markers.patch
-------------------------------------------------------------------
Tue Jul 9 13:43:10 UTC 2024 - Markéta Machová <mmachova@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package python-pytest-asyncio
#
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,12 +26,14 @@
%endif
%{?sle15_python_module_pythons}
Name: python-pytest-asyncio%{psuffix}
Version: 0.25.3
Version: 0.23.7
Release: 0
Summary: Pytest support for asyncio
License: Apache-2.0
URL: https://github.com/pytest-dev/pytest-asyncio
Source: https://github.com/pytest-dev/pytest-asyncio/archive/v%{version}.tar.gz#/pytest-asyncio-%{version}.tar.gz
# PATCH-FIX-UPSTREAM https://github.com/pytest-dev/pytest-asyncio/pull/838 Fix duplication of markers in async tests
Patch: duplicated-markers.patch
BuildRequires: %{python_module base >= 3.8}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools_scm}
@ -39,10 +41,14 @@ BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: (python-pytest >= 8.2.0 with python-pytest < 9)
Requires: (python-pytest >= 7.0.0 with python-pytest < 9)
%if 0%{?python_version_nodots} < 38
Requires: python-typing-extensions >= 3.7.2
%endif
BuildArch: noarch
%if %{with test}
BuildRequires: %{python_module hypothesis >= 5.7.1}
BuildRequires: %{python_module pytest >= 7.0.0 with %python-pytest < 9}
BuildRequires: %{python_module pytest-asyncio = %{version}}
%endif
%python_subpackages