Skip to content
Draft
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
b2187ea
Remove pytest_plugin
Dreamsorcerer Apr 20, 2025
9618fe0
Add to lint requirements too
Dreamsorcerer Apr 20, 2025
c73a8bc
Merge branch 'master' into drop-pytest-plugin
bdraco Apr 21, 2025
e0e1a5f
recompile
bdraco Apr 22, 2025
3ac806b
Merge branch 'master' into drop-pytest-plugin
bdraco Apr 22, 2025
1c4dbb0
Update conftest.py
Dreamsorcerer Apr 22, 2025
b9a3723
Rename loop to event_loop
Dreamsorcerer Apr 22, 2025
e336f0e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 22, 2025
d213299
Rename variables to event_loop
Dreamsorcerer Apr 22, 2025
c08b15e
Merge branch 'drop-pytest-plugin' of github.com:aio-libs/aiohttp into…
Dreamsorcerer Apr 22, 2025
3f59011
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 22, 2025
f7d0114
Fix
Dreamsorcerer Apr 22, 2025
19520c3
Merge branch 'drop-pytest-plugin' of github.com:aio-libs/aiohttp into…
Dreamsorcerer Apr 22, 2025
f27bf61
Fix
Dreamsorcerer Apr 22, 2025
bf40464
Fix
Dreamsorcerer Apr 22, 2025
13bef44
Fix
Dreamsorcerer Apr 22, 2025
b21dead
Fix
Dreamsorcerer Apr 22, 2025
cf4a292
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 22, 2025
c3649e2
Fix
Dreamsorcerer Apr 22, 2025
f789ab0
Merge branch 'drop-pytest-plugin' of github.com:aio-libs/aiohttp into…
Dreamsorcerer Apr 22, 2025
6cef9ce
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 22, 2025
c8bb29c
Update conftest.py
Dreamsorcerer Apr 22, 2025
6847e95
Fix type
Dreamsorcerer Apr 22, 2025
3c9f8cf
Update setup.cfg
Dreamsorcerer Apr 22, 2025
feeb6d0
Fix
Dreamsorcerer Apr 22, 2025
7ca78e8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 22, 2025
ff0b7b6
Fix
Dreamsorcerer Apr 23, 2025
179b945
Merge branch 'drop-pytest-plugin' of github.com:aio-libs/aiohttp into…
Dreamsorcerer Apr 23, 2025
2e5036c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 23, 2025
36d8590
Fix
Dreamsorcerer Apr 23, 2025
fde89ab
Fix
Dreamsorcerer Apr 23, 2025
bb39572
Fix
Dreamsorcerer Apr 23, 2025
4d4cf08
Fix
Dreamsorcerer Apr 23, 2025
a941003
Fix
Dreamsorcerer Apr 24, 2025
cac7a7a
Remove old fixtures
Dreamsorcerer Apr 24, 2025
a2dfcdf
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 24, 2025
f4e3f05
Fix
Dreamsorcerer Apr 24, 2025
3a63a8a
Merge branch 'drop-pytest-plugin' of github.com:aio-libs/aiohttp into…
Dreamsorcerer Apr 24, 2025
7316165
Fix
Dreamsorcerer Apr 24, 2025
5fd8d88
Fix
Dreamsorcerer Apr 24, 2025
2e32242
Revert test
Dreamsorcerer Apr 24, 2025
4dcafa3
Fix
Dreamsorcerer Apr 24, 2025
0d113a6
Update tests/test_connector.py
Dreamsorcerer Apr 24, 2025
ed21262
Merge branch 'master' into drop-pytest-plugin
Dreamsorcerer Apr 24, 2025
f1f3a76
Disable xdist
Dreamsorcerer Apr 25, 2025
7a52b83
Update conftest.py
Dreamsorcerer May 5, 2025
9cc2a13
Update test_resolver.py
Dreamsorcerer May 5, 2025
0d201a8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 5, 2025
6506500
Update test_cookiejar.py
Dreamsorcerer May 5, 2025
d8fa5ee
Update test_proxy.py
Dreamsorcerer May 5, 2025
6e403e4
Update test_run_app.py
Dreamsorcerer May 5, 2025
d446613
Update test_test_utils.py
Dreamsorcerer May 5, 2025
756c9fc
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 5, 2025
786ada1
Update test_web_runner.py
Dreamsorcerer May 5, 2025
625fece
Update test_run_app.py
Dreamsorcerer May 5, 2025
3de0180
Update test_test_utils.py
Dreamsorcerer May 5, 2025
c80254e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 5, 2025
025f8db
Update test_run_app.py
Dreamsorcerer May 5, 2025
57fa73a
Update test_streams.py
Dreamsorcerer May 5, 2025
e8a2af0
Update test_tracing.py
Dreamsorcerer May 5, 2025
c226b79
Update test_run_app.py
Dreamsorcerer May 5, 2025
e3e1e31
Update test_proxy_functional.py
Dreamsorcerer May 5, 2025
ac125d3
Update test_cookiejar.py
Dreamsorcerer May 5, 2025
13fa92c
Update test_web_runner.py
Dreamsorcerer May 5, 2025
1ab80c3
Update test_web_websocket_functional.py
Dreamsorcerer May 5, 2025
13df9ae
Update test_web_server.py
Dreamsorcerer May 5, 2025
d5d244a
Update test_proxy.py
Dreamsorcerer May 5, 2025
0eb5bb6
unused port
Dreamsorcerer May 5, 2025
3b88426
Revert context manager
Dreamsorcerer May 5, 2025
b705b4d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 5, 2025
9484c9a
Update conftest.py
Dreamsorcerer May 5, 2025
5a5b940
Update test_utils.py
Dreamsorcerer May 5, 2025
593d180
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 5, 2025
be21ac6
Update check_for_client_response_leak.py
Dreamsorcerer May 5, 2025
46db15a
Update check_for_request_leak.py
Dreamsorcerer May 5, 2025
6a07401
Update test_web_runner.py
Dreamsorcerer May 5, 2025
519ac7f
Update conftest.py
Dreamsorcerer May 5, 2025
c5b1021
Update test_resolver.py
Dreamsorcerer May 5, 2025
bf63d3d
Update tests/test_proxy.py
Dreamsorcerer May 5, 2025
88bbd0c
Apply suggestions from code review
Dreamsorcerer Jun 20, 2025
4c2bc7d
Merge branch 'master' into drop-pytest-plugin
Dreamsorcerer Jun 20, 2025
c505fc8
Merge branch 'master' into drop-pytest-plugin
Dreamsorcerer Jun 20, 2025
e744edb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 20, 2025
4e6c60e
Fix
Dreamsorcerer Jun 20, 2025
1315006
Merge branch 'drop-pytest-plugin' of github.com:aio-libs/aiohttp into…
Dreamsorcerer Jun 20, 2025
2316b5a
Fix
Dreamsorcerer Jun 20, 2025
8102304
Fix
Dreamsorcerer Jun 20, 2025
4f52f55
Fix
Dreamsorcerer Jun 20, 2025
7d04320
Fix
Dreamsorcerer Jun 20, 2025
f968b88
Fix
Dreamsorcerer Jun 20, 2025
6735c05
Update conftest.py
Dreamsorcerer Jun 21, 2025
fc7c45f
Fix
Dreamsorcerer Jun 21, 2025
bd955ee
Fix
Dreamsorcerer Jun 21, 2025
7590678
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 21, 2025
8cfe643
Fix
Dreamsorcerer Jun 21, 2025
aa07efe
Merge branch 'drop-pytest-plugin' of github.com:aio-libs/aiohttp into…
Dreamsorcerer Jun 21, 2025
fea1988
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 21, 2025
d7c4256
Fix
Dreamsorcerer Jun 21, 2025
fa644ea
Merge branch 'drop-pytest-plugin' of github.com:aio-libs/aiohttp into…
Dreamsorcerer Jun 21, 2025
a3ef42d
Fix
Dreamsorcerer Jun 21, 2025
47d1d88
Fix
Dreamsorcerer Jun 21, 2025
a0c08ec
Fix
Dreamsorcerer Jun 21, 2025
1a4a745
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 21, 2025
30c993b
Fix
Dreamsorcerer Jun 21, 2025
f13f24a
Merge branch 'drop-pytest-plugin' of github.com:aio-libs/aiohttp into…
Dreamsorcerer Jun 21, 2025
215752c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 21, 2025
723316a
Fix
Dreamsorcerer Jun 21, 2025
186cff6
Merge branch 'drop-pytest-plugin' of github.com:aio-libs/aiohttp into…
Dreamsorcerer Jun 21, 2025
44e7b61
Update test_proxy.py
Dreamsorcerer Jun 21, 2025
eeb31e8
Update tests/test_cookiejar.py
Dreamsorcerer Jun 21, 2025
9d79277
Update tests/test_cookiejar.py
Dreamsorcerer Jun 21, 2025
4380fb4
Update test_cookiejar.py
Dreamsorcerer Jun 22, 2025
173e180
Update test_cookiejar.py
Dreamsorcerer Jun 22, 2025
3e4cb03
Update test_cookiejar.py
Dreamsorcerer Jun 22, 2025
ca8d21b
Update test_cookiejar.py
Dreamsorcerer Jun 22, 2025
b1e3a1d
Update test_cookiejar.py
Dreamsorcerer Jun 22, 2025
8a8235c
Update test_cookiejar.py
Dreamsorcerer Jun 22, 2025
8c1d431
Update test_cookiejar.py
Dreamsorcerer Jun 22, 2025
e32e321
Update test_cookiejar.py
Dreamsorcerer Jun 22, 2025
70fcaab
Fix
Dreamsorcerer Jun 22, 2025
c0928cd
Fix
Dreamsorcerer Jun 22, 2025
680ca58
Fix
Dreamsorcerer Jun 22, 2025
e0d2f82
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 22, 2025
6f16be1
Update test_run_app.py
Dreamsorcerer Jun 22, 2025
3ffc18a
Merge branch 'master' into drop-pytest-plugin
Dreamsorcerer Jun 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
441 changes: 0 additions & 441 deletions aiohttp/pytest_plugin.py

This file was deleted.

4 changes: 0 additions & 4 deletions docs/testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ For using pytest plugin please install pytest-aiohttp_ library:

$ pip install pytest-aiohttp

If you don't want to install *pytest-aiohttp* for some reason you may
insert ``pytest_plugins = 'aiohttp.pytest_plugin'`` line into
``conftest.py`` instead for the same functionality.



The Test Client and Servers
Expand Down
32 changes: 27 additions & 5 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.10
# To update, run:
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --allow-unsafe --output-file=requirements/constraints.txt --resolver=backtracking --strip-extras requirements/constraints.in
#
Expand All @@ -9,19 +9,28 @@ aiodns==3.2.0 ; sys_platform == "linux" or sys_platform == "darwin"
# -r requirements/lint.in
# -r requirements/runtime-deps.in
aiohappyeyeballs==2.6.1
# via -r requirements/runtime-deps.in
# via
# -r requirements/runtime-deps.in
# aiohttp
aiohttp==3.11.18
# via pytest-aiohttp
aiohttp-theme==0.1.7
# via -r requirements/doc.in
aiosignal==1.3.2
# via -r requirements/runtime-deps.in
# via
# -r requirements/runtime-deps.in
# aiohttp
alabaster==1.0.0
# via sphinx
annotated-types==0.7.0
# via pydantic
async-timeout==5.0.1 ; python_version < "3.11"
# via
# -r requirements/runtime-deps.in
# aiohttp
# valkey
attrs==25.3.0
# via aiohttp
babel==2.17.0
# via sphinx
blockbuster==1.5.24
Expand Down Expand Up @@ -81,6 +90,7 @@ freezegun==1.5.1
frozenlist==1.6.0
# via
# -r requirements/runtime-deps.in
# aiohttp
# aiosignal
gidgethub==5.3.0
# via cherry-picker
Expand Down Expand Up @@ -117,6 +127,7 @@ multidict==6.4.3
# via
# -r requirements/multidict.in
# -r requirements/runtime-deps.in
# aiohttp
# yarl
mypy==1.15.0 ; implementation_name == "cpython"
# via
Expand Down Expand Up @@ -144,6 +155,7 @@ pre-commit==4.2.0
propcache==0.3.1
# via
# -r requirements/runtime-deps.in
# aiohttp
# yarl
proxy-py==2.4.10
# via
Expand Down Expand Up @@ -175,10 +187,18 @@ pytest==8.1.1
# via
# -r requirements/lint.in
# -r requirements/test.in
# pytest-aiohttp
# pytest-asyncio
# pytest-codspeed
# pytest-cov
# pytest-mock
# pytest-xdist
pytest-aiohttp==1.1.0
# via
# -r requirements/lint.in
# -r requirements/test.in
pytest-asyncio==0.23.8
# via pytest-aiohttp
pytest-codspeed==3.2.0
# via
# -r requirements/lint.in
Expand Down Expand Up @@ -287,7 +307,9 @@ wait-for-it==2.3.0
wheel==0.46.0
# via pip-tools
yarl==1.20.0
# via -r requirements/runtime-deps.in
# via
# -r requirements/runtime-deps.in
# aiohttp
zlib-ng==0.5.1
# via
# -r requirements/lint.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/cython.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with python 3.10
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --allow-unsafe --output-file=requirements/cython.txt --resolver=backtracking --strip-extras requirements/cython.in
Expand Down
32 changes: 27 additions & 5 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.10
# To update, run:
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --allow-unsafe --output-file=requirements/dev.txt --resolver=backtracking --strip-extras requirements/dev.in
#
Expand All @@ -9,19 +9,28 @@ aiodns==3.2.0 ; sys_platform == "linux" or sys_platform == "darwin"
# -r requirements/lint.in
# -r requirements/runtime-deps.in
aiohappyeyeballs==2.6.1
# via -r requirements/runtime-deps.in
# via
# -r requirements/runtime-deps.in
# aiohttp
aiohttp==3.11.18
# via pytest-aiohttp
aiohttp-theme==0.1.7
# via -r requirements/doc.in
aiosignal==1.3.2
# via -r requirements/runtime-deps.in
# via
# -r requirements/runtime-deps.in
# aiohttp
alabaster==1.0.0
# via sphinx
annotated-types==0.7.0
# via pydantic
async-timeout==5.0.1 ; python_version < "3.11"
# via
# -r requirements/runtime-deps.in
# aiohttp
# valkey
attrs==25.3.0
# via aiohttp
babel==2.17.0
# via sphinx
blockbuster==1.5.24
Expand Down Expand Up @@ -79,6 +88,7 @@ freezegun==1.5.1
frozenlist==1.6.0
# via
# -r requirements/runtime-deps.in
# aiohttp
# aiosignal
gidgethub==5.3.0
# via cherry-picker
Expand Down Expand Up @@ -114,6 +124,7 @@ mdurl==0.1.2
multidict==6.4.3
# via
# -r requirements/runtime-deps.in
# aiohttp
# yarl
mypy==1.15.0 ; implementation_name == "cpython"
# via
Expand Down Expand Up @@ -141,6 +152,7 @@ pre-commit==4.2.0
propcache==0.3.1
# via
# -r requirements/runtime-deps.in
# aiohttp
# yarl
proxy-py==2.4.10
# via
Expand Down Expand Up @@ -170,10 +182,18 @@ pytest==8.1.1
# via
# -r requirements/lint.in
# -r requirements/test.in
# pytest-aiohttp
# pytest-asyncio
# pytest-codspeed
# pytest-cov
# pytest-mock
# pytest-xdist
pytest-aiohttp==1.1.0
# via
# -r requirements/lint.in
# -r requirements/test.in
pytest-asyncio==0.23.8
# via pytest-aiohttp
pytest-codspeed==3.2.0
# via
# -r requirements/lint.in
Expand Down Expand Up @@ -278,7 +298,9 @@ wait-for-it==2.3.0
wheel==0.46.0
# via pip-tools
yarl==1.20.0
# via -r requirements/runtime-deps.in
# via
# -r requirements/runtime-deps.in
# aiohttp
zlib-ng==0.5.1
# via
# -r requirements/lint.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.10
# To update, run:
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --allow-unsafe --output-file=requirements/doc.txt --resolver=backtracking --strip-extras requirements/doc.in
#
Expand Down
1 change: 1 addition & 0 deletions requirements/lint.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ mypy; implementation_name == "cpython"
pre-commit
proxy.py
pytest
pytest-aiohttp
pytest-mock
pytest_codspeed
python-on-whales
Expand Down
39 changes: 36 additions & 3 deletions requirements/lint.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
#
# This file is autogenerated by pip-compile with python 3.10
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --allow-unsafe --output-file=requirements/lint.txt --strip-extras requirements/lint.in
#
aiodns==3.2.0
# via -r requirements/lint.in
aiohappyeyeballs==2.6.1
# via aiohttp
aiohttp==3.11.18
# via pytest-aiohttp
aiosignal==1.3.2
# via aiohttp
annotated-types==0.7.0
# via pydantic
async-timeout==5.0.1
# via valkey
# via
# aiohttp
# valkey
attrs==25.3.0
# via aiohttp
blockbuster==1.5.24
# via -r requirements/lint.in
cffi==1.17.1
Expand All @@ -33,10 +43,16 @@ forbiddenfruit==0.1.4
# via blockbuster
freezegun==1.5.1
# via -r requirements/lint.in
frozenlist==1.6.0
# via
# aiohttp
# aiosignal
identify==2.6.10
# via pre-commit
idna==3.7
# via trustme
# via
# trustme
# yarl
iniconfig==2.1.0
# via pytest
isal==1.7.2
Expand All @@ -45,6 +61,10 @@ markdown-it-py==3.0.0
# via rich
mdurl==0.1.2
# via markdown-it-py
multidict==6.4.3
# via
# aiohttp
# yarl
mypy==1.15.0 ; implementation_name == "cpython"
# via -r requirements/lint.in
mypy-extensions==1.0.0
Expand All @@ -59,6 +79,10 @@ pluggy==1.5.0
# via pytest
pre-commit==4.2.0
# via -r requirements/lint.in
propcache==0.3.1
# via
# aiohttp
# yarl
proxy-py==2.4.10
# via -r requirements/lint.in
pycares==4.6.1
Expand All @@ -74,8 +98,14 @@ pygments==2.19.1
pytest==8.1.1
# via
# -r requirements/lint.in
# pytest-aiohttp
# pytest-asyncio
# pytest-codspeed
# pytest-mock
pytest-aiohttp==1.1.0
# via -r requirements/lint.in
pytest-asyncio==0.23.8
# via pytest-aiohttp
pytest-codspeed==3.2.0
# via -r requirements/lint.in
pytest-mock==3.14.0
Expand All @@ -101,6 +131,7 @@ trustme==1.2.1
# via -r requirements/lint.in
typing-extensions==4.13.2
# via
# multidict
# mypy
# pydantic
# pydantic-core
Expand All @@ -115,5 +146,7 @@ valkey==6.1.0
# via -r requirements/lint.in
virtualenv==20.30.0
# via pre-commit
yarl==1.20.0
# via aiohttp
zlib-ng==0.5.1
# via -r requirements/lint.in
2 changes: 1 addition & 1 deletion requirements/multidict.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with python 3.10
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --allow-unsafe --output-file=requirements/multidict.txt --resolver=backtracking --strip-extras requirements/multidict.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/runtime-deps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --allow-unsafe --output-file=requirements/runtime-deps.txt --strip-extras requirements/runtime-deps.in
# pip-compile --allow-unsafe --output-file=requirements/runtime-deps.txt --resolver=backtracking --strip-extras requirements/runtime-deps.in
#
aiodns==3.2.0 ; sys_platform == "linux" or sys_platform == "darwin"
# via -r requirements/runtime-deps.in
Expand Down
1 change: 1 addition & 0 deletions requirements/test.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ isal
mypy; implementation_name == "cpython"
proxy.py >= 2.4.4rc5
pytest
pytest-aiohttp
pytest-cov
pytest-mock
pytest-xdist
Expand Down
Loading
Loading