[3.5] Close session on error in aiohttp.request (#3628) (#3640) (#3917)

(cherry picked from commit 20bfadc)

Co-authored-by: Robert Nikolich <[email protected]>

CHANGES/3628.bugfix

@@ -0,0 +1 @@
+Close session created inside ``aiohttp.request`` when unhandled exception occurs

CONTRIBUTORS.txt

@@ -192,6 +192,7 @@ Rafael Viotti
 Raúl Cumplido
 Required Field
 Robert Lu
+Robert Nikolich
 Roman Podoliaka
 Samuel Colvin
 Sean Hunt

aiohttp/client.py

@@ -1048,8 +1048,13 @@ def __init__(self,
         self._session = session
 
     async def __aenter__(self) -> ClientResponse:
-        self._resp = await self._coro
-        return self._resp
+        try:
+            self._resp = await self._coro
+        except BaseException:
+            await self._session.close()
+            raise
+        else:
+            return self._resp
 
     async def __aexit__(self,
                         exc_type: Optional[Type[BaseException]],

tests/test_client_functional.py

@@ -2383,6 +2383,24 @@ async def handler(request):
         assert resp.status == 200
 
 
+async def test_aiohttp_request_ctx_manager_close_sess_on_error(
+        ssl_ctx, aiohttp_server) -> None:
+    async def handler(request):
+        return web.Response()
+
+    app = web.Application()
+    app.router.add_get('/', handler)
+    server = await aiohttp_server(app, ssl=ssl_ctx)
+
+    cm = aiohttp.request('GET', server.make_url('/'))
+
+    with pytest.raises(aiohttp.ClientConnectionError):
+        async with cm:
+            pass
+
+    assert cm._session.closed
+
+
 async def test_aiohttp_request_ctx_manager_not_found() -> None:
 
     with pytest.raises(aiohttp.ClientConnectionError):