Fix flaky tests with unclosed warnings (#8391)

Author: Dreamsorcerer

tests/test_proxy_functional.py

@@ -17,18 +17,6 @@
 from aiohttp import web
 from aiohttp.client_exceptions import ClientConnectionError
 
-pytestmark = [
-    pytest.mark.filterwarnings(
-        "ignore:unclosed <socket.socket fd=.*:ResourceWarning",
-    ),
-    pytest.mark.filterwarnings(
-        "ignore:"
-        "unclosed transport <_SelectorSocketTransport closing fd=.*"
-        ":ResourceWarning",
-    ),
-]
-
-
 ASYNCIO_SUPPORTS_TLS_IN_TLS = sys.version_info >= (3, 11)
 
 
@@ -120,16 +108,14 @@ async def test_secure_https_proxy_absolute_path(
     conn = aiohttp.TCPConnector()
     sess = aiohttp.ClientSession(connector=conn)
 
-    response = await sess.get(
+    async with sess.get(
         web_server_endpoint_url,
         proxy=secure_proxy_url,
         ssl=client_ssl_ctx,  # used for both proxy and endpoint connections
-    )
-
-    assert response.status == 200
-    assert await response.text() == web_server_endpoint_payload
+    ) as response:
+        assert response.status == 200
+        assert await response.text() == web_server_endpoint_payload
 
-    response.close()
     await sess.close()
     await conn.close()
 
@@ -195,7 +181,8 @@ async def test_https_proxy_unsupported_tls_in_tls(
         ClientConnectionError,
         match=expected_exception_reason,
     ) as conn_err:
-        await sess.get(url, proxy=secure_proxy_url, ssl=client_ssl_ctx)
+        async with sess.get(url, proxy=secure_proxy_url, ssl=client_ssl_ctx):
+            pass
 
     assert isinstance(conn_err.value.__cause__, TypeError)
     assert match_regex(f"^{type_err!s}$", str(conn_err.value.__cause__))
@@ -255,13 +242,11 @@ async def proxy_server():
 def get_request(loop: Any):
     async def _request(method="GET", *, url, trust_env=False, **kwargs):
         connector = aiohttp.TCPConnector(ssl=False)
-        client = aiohttp.ClientSession(connector=connector, trust_env=trust_env)
-        try:
-            resp = await client.request(method, url, **kwargs)
-            await resp.release()
-            return resp
-        finally:
-            await client.close()
+        async with aiohttp.ClientSession(
+            connector=connector, trust_env=trust_env
+        ) as client:
+            async with client.request(method, url, **kwargs) as resp:
+                return resp
 
     return _request
 
@@ -411,11 +396,8 @@ async def test_proxy_http_acquired_cleanup_force(
     assert 0 == len(conn._acquired)
 
     async def request():
-        resp = await sess.get(url, proxy=proxy.url)
-
-        assert 1 == len(conn._acquired)
-
-        await resp.release()
+        async with sess.get(url, proxy=proxy.url):
+            assert 1 == len(conn._acquired)
 
     await request()
 
@@ -439,13 +421,11 @@ async def request(pid):
         # process requests only one by one
         nonlocal current_pid
 
-        resp = await sess.get(url, proxy=proxy.url)
-
-        current_pid = pid
-        await asyncio.sleep(0.2)
-        assert current_pid == pid
+        async with sess.get(url, proxy=proxy.url) as resp:
+            current_pid = pid
+            await asyncio.sleep(0.2)
+            assert current_pid == pid
 
-        await resp.release()
         return resp
 
     requests = [request(pid) for pid in range(multi_conn_num)]
@@ -498,9 +478,8 @@ async def xtest_proxy_https_send_body(proxy_test_server: Any, loop: Any) -> None
     proxy.return_value = {"status": 200, "body": b"1" * (2**20)}
     url = "https://www.google.com.ua/search?q=aiohttp proxy"
 
-    resp = await sess.get(url, proxy=proxy.url)
-    body = await resp.read()
-    await resp.release()
+    async with sess.get(url, proxy=proxy.url) as resp:
+        body = await resp.read()
     await sess.close()
 
     assert body == b"1" * (2**20)
@@ -598,11 +577,8 @@ async def xtest_proxy_https_acquired_cleanup(proxy_test_server: Any, loop: Any)
     assert 0 == len(conn._acquired)
 
     async def request():
-        resp = await sess.get(url, proxy=proxy.url)
-
-        assert 1 == len(conn._acquired)
-
-        await resp.release()
+        async with sess.get(url, proxy=proxy.url):
+            assert 1 == len(conn._acquired)
 
     await request()
 
@@ -624,11 +600,8 @@ async def xtest_proxy_https_acquired_cleanup_force(
     assert 0 == len(conn._acquired)
 
     async def request():
-        resp = await sess.get(url, proxy=proxy.url)
-
-        assert 1 == len(conn._acquired)
-
-        await resp.release()
+        async with sess.get(url, proxy=proxy.url):
+            assert 1 == len(conn._acquired)
 
     await request()
 
@@ -652,13 +625,11 @@ async def request(pid):
         # process requests only one by one
         nonlocal current_pid
 
-        resp = await sess.get(url, proxy=proxy.url)
-
-        current_pid = pid
-        await asyncio.sleep(0.2)
-        assert current_pid == pid
+        async with sess.get(url, proxy=proxy.url) as resp:
+            current_pid = pid
+            await asyncio.sleep(0.2)
+            assert current_pid == pid
 
-        await resp.release()
         return resp
 
     requests = [request(pid) for pid in range(multi_conn_num)]
@@ -872,8 +843,9 @@ async def test_proxy_auth() -> None:
         with pytest.raises(
             ValueError, match=r"proxy_auth must be None or BasicAuth\(\) tuple"
         ):
-            await session.get(
+            async with session.get(
                 "http://python.org",
                 proxy="http://proxy.example.com",
                 proxy_auth=("user", "pass"),
-            )
+            ):
+                pass