Skip to content

Commit c4442c9

Browse files
authored
Merge pull request #13920 from pytest-dev/patchback/backports/9.0.x/3fe80c714fe18f2926b42997b55b05e6b2e90ab0/pr-13918
[PR #13918/3fe80c71 backport][9.0.x] testing: restore pytest-asyncio integration test
2 parents 17b82a4 + 32602a3 commit c4442c9

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

testing/plugins_integration/pytest.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[pytest]
22
strict_markers = True
3-
; Temporarily disabled until adds support for pytest 9.
4-
; asyncio_mode = strict
3+
asyncio_mode = strict
54
filterwarnings =
65
error::pytest.PytestWarning
76
ignore:usefixtures.* without arguments has no effect:pytest.PytestWarning

testing/plugins_integration/requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
anyio[trio]==4.11.0
22
django==5.2.8
3-
# Temporarily disabled until adds support for pytest 9.
4-
#pytest-asyncio==1.2.0
3+
pytest-asyncio==1.3.0
54
pytest-bdd==8.1.0
65
pytest-cov==7.0.0
76
pytest-django==4.11.1

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ commands =
175175
pytest --html=simple.html simple_integration.py
176176
pytest --reruns 5 simple_integration.py pytest_rerunfailures_integration.py
177177
pytest pytest_anyio_integration.py
178-
# Temporarily disabled until adds support for pytest 9.
179-
# pytest pytest_asyncio_integration.py
178+
pytest pytest_asyncio_integration.py
180179
pytest pytest_mock_integration.py
181180
pytest pytest_trio_integration.py
182181
pytest pytest_twisted_integration.py

0 commit comments

Comments
 (0)