Trapping transports exceptions in TransportConnectionFailed Exception

Author: leszekhanusz

gql/transport/aiohttp.py

@@ -31,6 +31,8 @@
 from .exceptions import (
     TransportAlreadyConnected,
     TransportClosed,
+    TransportConnectionFailed,
+    TransportError,
     TransportProtocolError,
     TransportServerError,
 )
@@ -377,6 +379,10 @@ async def execute(
         try:
             async with self.session.post(self.url, ssl=self.ssl, **post_args) as resp:
                 return await self._prepare_result(resp)
+        except TransportError:
+            raise
+        except Exception as e:
+            raise TransportConnectionFailed(str(e)) from e
         finally:
             if upload_files:
                 close_files(list(self.files.values()))
@@ -407,8 +413,13 @@ async def execute_batch(
             extra_args,
         )
 
-        async with self.session.post(self.url, ssl=self.ssl, **post_args) as resp:
-            return await self._prepare_batch_result(reqs, resp)
+        try:
+            async with self.session.post(self.url, ssl=self.ssl, **post_args) as resp:
+                return await self._prepare_batch_result(reqs, resp)
+        except TransportError:
+            raise
+        except Exception as e:
+            raise TransportConnectionFailed(str(e)) from e
 
     def subscribe(
         self,

gql/transport/httpx.py

@@ -23,6 +23,7 @@
 from .exceptions import (
     TransportAlreadyConnected,
     TransportClosed,
+    TransportConnectionFailed,
     TransportProtocolError,
     TransportServerError,
 )
@@ -262,6 +263,8 @@ def execute(
 
         try:
             response = self.client.post(self.url, **post_args)
+        except Exception as e:
+            raise TransportConnectionFailed(str(e)) from e
         finally:
             if upload_files:
                 close_files(list(self.files.values()))
@@ -294,7 +297,10 @@ def execute_batch(
             extra_args=extra_args,
         )
 
-        response = self.client.post(self.url, **post_args)
+        try:
+            response = self.client.post(self.url, **post_args)
+        except Exception as e:
+            raise TransportConnectionFailed(str(e)) from e
 
         return self._prepare_batch_result(reqs, response)
 
@@ -354,6 +360,8 @@ async def execute(
 
         try:
             response = await self.client.post(self.url, **post_args)
+        except Exception as e:
+            raise TransportConnectionFailed(str(e)) from e
         finally:
             if upload_files:
                 close_files(list(self.files.values()))
@@ -386,7 +394,10 @@ async def execute_batch(
             extra_args=extra_args,
         )
 
-        response = await self.client.post(self.url, **post_args)
+        try:
+            response = await self.client.post(self.url, **post_args)
+        except Exception as e:
+            raise TransportConnectionFailed(str(e)) from e
 
         return self._prepare_batch_result(reqs, response)
 

gql/transport/requests.py

@@ -29,6 +29,7 @@
 from .exceptions import (
     TransportAlreadyConnected,
     TransportClosed,
+    TransportConnectionFailed,
     TransportProtocolError,
     TransportServerError,
 )
@@ -289,6 +290,8 @@ def execute(
         # Using the created session to perform requests
         try:
             response = self.session.request(self.method, self.url, **post_args)
+        except Exception as e:
+            raise TransportConnectionFailed(str(e)) from e
         finally:
             if upload_files:
                 close_files(list(self.files.values()))
@@ -349,11 +352,14 @@ def execute_batch(
             extra_args=extra_args,
         )
 
-        response = self.session.request(
-            self.method,
-            self.url,
-            **post_args,
-        )
+        try:
+            response = self.session.request(
+                self.method,
+                self.url,
+                **post_args,
+            )
+        except Exception as e:
+            raise TransportConnectionFailed(str(e)) from e
 
         return self._prepare_batch_result(reqs, response)
 

tests/test_aiohttp.py

@@ -11,6 +11,7 @@
 from gql.transport.exceptions import (
     TransportAlreadyConnected,
     TransportClosed,
+    TransportConnectionFailed,
     TransportProtocolError,
     TransportQueryError,
     TransportServerError,
@@ -1455,7 +1456,6 @@ async def handler(request):
 async def test_aiohttp_query_https_self_cert_fail(ssl_aiohttp_server):
     """By default, we should verify the ssl certificate"""
     from aiohttp import web
-    from aiohttp.client_exceptions import ClientConnectorCertificateError
 
     from gql.transport.aiohttp import AIOHTTPTransport
 
@@ -1472,16 +1472,22 @@ async def handler(request):
 
     transport = AIOHTTPTransport(url=url, timeout=10)
 
-    with pytest.raises(ClientConnectorCertificateError) as exc_info:
-        async with Client(transport=transport) as session:
-            query = gql(query1_str)
+    query = gql(query1_str)
 
-            # Execute query asynchronously
+    expected_error = "certificate verify failed: self-signed certificate"
+
+    with pytest.raises(TransportConnectionFailed) as exc_info:
+        async with Client(transport=transport) as session:
             await session.execute(query)
 
-    expected_error = "certificate verify failed: self-signed certificate"
+    assert expected_error in str(exc_info.value)
+
+    with pytest.raises(TransportConnectionFailed) as exc_info:
+        async with Client(transport=transport) as session:
+            await session.execute_batch([query])
 
     assert expected_error in str(exc_info.value)
+
     assert transport.session is None
 
 

tests/test_httpx.py

@@ -7,6 +7,7 @@
 from gql.transport.exceptions import (
     TransportAlreadyConnected,
     TransportClosed,
+    TransportConnectionFailed,
     TransportProtocolError,
     TransportQueryError,
     TransportServerError,
@@ -150,7 +151,6 @@ async def test_httpx_query_https_self_cert_fail(
 ):
     """By default, we should verify the ssl certificate"""
     from aiohttp import web
-    from httpx import ConnectError
 
     from gql.transport.httpx import HTTPXTransport
 
@@ -180,15 +180,19 @@ def test_code():
             **extra_args,
         )
 
-        with pytest.raises(ConnectError) as exc_info:
-            with Client(transport=transport) as session:
+        query = gql(query1_str)
 
-                query = gql(query1_str)
+        expected_error = "certificate verify failed: self-signed certificate"
 
-                # Execute query synchronously
+        with pytest.raises(TransportConnectionFailed) as exc_info:
+            with Client(transport=transport) as session:
                 session.execute(query)
 
-        expected_error = "certificate verify failed: self-signed certificate"
+        assert expected_error in str(exc_info.value)
+
+        with pytest.raises(TransportConnectionFailed) as exc_info:
+            with Client(transport=transport) as session:
+                session.execute_batch([query])
 
         assert expected_error in str(exc_info.value)
 

tests/test_httpx_async.py

@@ -9,6 +9,7 @@
 from gql.transport.exceptions import (
     TransportAlreadyConnected,
     TransportClosed,
+    TransportConnectionFailed,
     TransportProtocolError,
     TransportQueryError,
     TransportServerError,
@@ -1155,7 +1156,6 @@ async def handler(request):
 @pytest.mark.parametrize("verify_https", ["explicitely_enabled", "default"])
 async def test_httpx_query_https_self_cert_fail(ssl_aiohttp_server, verify_https):
     from aiohttp import web
-    from httpx import ConnectError
 
     from gql.transport.httpx import HTTPXAsyncTransport
 
@@ -1177,15 +1177,19 @@ async def handler(request):
 
     transport = HTTPXAsyncTransport(url=url, timeout=10, **extra_args)
 
-    with pytest.raises(ConnectError) as exc_info:
-        async with Client(transport=transport) as session:
+    query = gql(query1_str)
 
-            query = gql(query1_str)
+    expected_error = "certificate verify failed: self-signed certificate"
 
-            # Execute query asynchronously
+    with pytest.raises(TransportConnectionFailed) as exc_info:
+        async with Client(transport=transport) as session:
             await session.execute(query)
 
-    expected_error = "certificate verify failed: self-signed certificate"
+    assert expected_error in str(exc_info.value)
+
+    with pytest.raises(TransportConnectionFailed) as exc_info:
+        async with Client(transport=transport) as session:
+            await session.execute_batch([query])
 
     assert expected_error in str(exc_info.value)
 

tests/test_requests.py

@@ -8,6 +8,7 @@
 from gql.transport.exceptions import (
     TransportAlreadyConnected,
     TransportClosed,
+    TransportConnectionFailed,
     TransportProtocolError,
     TransportQueryError,
     TransportServerError,
@@ -154,7 +155,6 @@ async def test_requests_query_https_self_cert_fail(
 ):
     """By default, we should verify the ssl certificate"""
     from aiohttp import web
-    from requests.exceptions import SSLError
 
     from gql.transport.requests import RequestsHTTPTransport
 
@@ -182,7 +182,7 @@ def test_code():
             **extra_args,
         )
 
-        with pytest.raises(SSLError) as exc_info:
+        with pytest.raises(TransportConnectionFailed) as exc_info:
             with Client(transport=transport) as session:
 
                 query = gql(query1_str)