From a19801b3fe4ae6d5c002985f4f95aa7f8dc246d0 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Mon, 28 Mar 2022 21:31:49 +0200 Subject: [PATCH 1/6] remove pytest.warns(None) Deprecated misuse of pytest.warns() https://docs.pytest.org/en/latest/deprecations.html#using-pytest-warns-none --- tests/test_client_functional.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tests/test_client_functional.py b/tests/test_client_functional.py index 1a62048c274..dd8b169d408 100644 --- a/tests/test_client_functional.py +++ b/tests/test_client_functional.py @@ -2444,19 +2444,15 @@ async def close(self): async def test_async_with_session() -> None: - with pytest.warns(None) as cm: - async with aiohttp.ClientSession() as session: - pass - assert len(cm.list) == 0 + async with aiohttp.ClientSession() as session: + pass assert session.closed async def test_session_close_awaitable() -> None: session = aiohttp.ClientSession() - with pytest.warns(None) as cm: - await session.close() - assert len(cm.list) == 0 + await session.close() assert session.closed @@ -2464,10 +2460,7 @@ async def test_session_close_awaitable() -> None: async def test_close_run_until_complete_not_deprecated() -> None: session = aiohttp.ClientSession() - with pytest.warns(None) as cm: - await session.close() - - assert len(cm.list) == 0 + await session.close() async def test_close_resp_on_error_async_with_session(aiohttp_server: Any) -> None: From b52b2ad410d45b44a0de2fb538f1bd0fc1d6825e Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Mon, 28 Mar 2022 21:37:04 +0200 Subject: [PATCH 2/6] Remove duplicate test test_session_close_awaitable() does the exact same thing and should throw a deprecation warning already which is caught by the general filter --- tests/test_client_functional.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/test_client_functional.py b/tests/test_client_functional.py index dd8b169d408..998b22f86bf 100644 --- a/tests/test_client_functional.py +++ b/tests/test_client_functional.py @@ -2457,12 +2457,6 @@ async def test_session_close_awaitable() -> None: assert session.closed -async def test_close_run_until_complete_not_deprecated() -> None: - session = aiohttp.ClientSession() - - await session.close() - - async def test_close_resp_on_error_async_with_session(aiohttp_server: Any) -> None: async def handler(request): resp = web.StreamResponse(headers={"content-length": "100"}) From e9e56467d6a11d30961b292af625d29f267ff8ec Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Mon, 28 Mar 2022 21:44:23 +0200 Subject: [PATCH 3/6] PR 6664 metadata --- CHANGES/6663.bugfix | 1 + CONTRIBUTORS.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 CHANGES/6663.bugfix diff --git a/CHANGES/6663.bugfix b/CHANGES/6663.bugfix new file mode 100644 index 00000000000..943827c99e7 --- /dev/null +++ b/CHANGES/6663.bugfix @@ -0,0 +1 @@ +Remove a deprecated misusage of pytest.warns(None) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 0432d7b6d80..bd7677f5f29 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -52,6 +52,7 @@ Artem Yushkovskiy Arthur Darcet Austin Scola Ben Bader +Ben Greiner Ben Timby Benedikt Reinartz Bob Haddleton From 6e92a696baab99dfcc2579c1db9357486265ee04 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Mon, 28 Mar 2022 22:51:41 +0200 Subject: [PATCH 4/6] "Fix" spelling. Bots everywhere! --- CHANGES/6663.bugfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES/6663.bugfix b/CHANGES/6663.bugfix index 943827c99e7..cb8b9a64f04 100644 --- a/CHANGES/6663.bugfix +++ b/CHANGES/6663.bugfix @@ -1 +1 @@ -Remove a deprecated misusage of pytest.warns(None) +Remove a deprecated mis-usage of pytest.warns(None) From d4ac1ea917b1fbf7a1d48df1c803d3f5a0404e5c Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Mon, 28 Mar 2022 22:42:23 +0100 Subject: [PATCH 5/6] Update 6663.bugfix --- CHANGES/6663.bugfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES/6663.bugfix b/CHANGES/6663.bugfix index cb8b9a64f04..943827c99e7 100644 --- a/CHANGES/6663.bugfix +++ b/CHANGES/6663.bugfix @@ -1 +1 @@ -Remove a deprecated mis-usage of pytest.warns(None) +Remove a deprecated misusage of pytest.warns(None) From ee07b6b2cc70ce2973a455238d4cd2344d3ff07e Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Mon, 28 Mar 2022 22:50:11 +0100 Subject: [PATCH 6/6] Update 6663.bugfix --- CHANGES/6663.bugfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES/6663.bugfix b/CHANGES/6663.bugfix index 943827c99e7..ee89799a0e9 100644 --- a/CHANGES/6663.bugfix +++ b/CHANGES/6663.bugfix @@ -1 +1 @@ -Remove a deprecated misusage of pytest.warns(None) +Remove a deprecated usage of pytest.warns(None)