Add new ssl_close_timeout argument to AIOHTTPTransport

Author: leszekhanusz

gql/transport/aiohttp.py

@@ -46,6 +46,7 @@ def __init__(
         auth: Optional[BasicAuth] = None,
         ssl: Union[SSLContext, bool, Fingerprint] = False,
         timeout: Optional[int] = None,
+        ssl_close_timeout: Optional[Union[int, float]] = 10,
         client_session_args: Optional[Dict[str, Any]] = None,
     ) -> None:
         """Initialize the transport with the given aiohttp parameters.
@@ -55,6 +56,8 @@ def __init__(
         :param cookies: Dict of HTTP cookies.
         :param auth: BasicAuth object to enable Basic HTTP auth if needed
         :param ssl: ssl_context of the connection. Use ssl=False to disable encryption
+        :param ssl_close_timeout: Timeout in seconds to wait for the ssl connection
+                                  to close properly
         :param client_session_args: Dict of extra args passed to
                 `aiohttp.ClientSession`_
 
@@ -67,6 +70,7 @@ def __init__(
         self.auth: Optional[BasicAuth] = auth
         self.ssl: Union[SSLContext, bool, Fingerprint] = ssl
         self.timeout: Optional[int] = timeout
+        self.ssl_close_timeout: Optional[Union[int, float]] = ssl_close_timeout
         self.client_session_args = client_session_args
         self.session: Optional[aiohttp.ClientSession] = None
 
@@ -165,7 +169,10 @@ async def close(self) -> None:
         if self.session is not None:
             closed_event = self.create_aiohttp_closed_event(self.session)
             await self.session.close()
-            await closed_event.wait()
+            try:
+                await asyncio.wait_for(closed_event.wait(), self.ssl_close_timeout)
+            except asyncio.TimeoutError:
+                pass
         self.session = None
 
     async def execute(

tests/test_aiohttp.py

@@ -1076,7 +1076,8 @@ async def handler(request):
 
 
 @pytest.mark.asyncio
-async def test_aiohttp_query_https(event_loop, ssl_aiohttp_server):
+@pytest.mark.parametrize("ssl_close_timeout", [0, 10])
+async def test_aiohttp_query_https(event_loop, ssl_aiohttp_server, ssl_close_timeout):
     from aiohttp import web
     from gql.transport.aiohttp import AIOHTTPTransport
 
@@ -1091,7 +1092,9 @@ async def handler(request):
 
     assert str(url).startswith("https://")
 
-    sample_transport = AIOHTTPTransport(url=url, timeout=10)
+    sample_transport = AIOHTTPTransport(
+        url=url, timeout=10, ssl_close_timeout=ssl_close_timeout
+    )
 
     async with Client(transport=sample_transport,) as session: