Got all tests fully working

Author: syrusakbary

src/graphql_server/http/async_base_view.py

@@ -145,9 +145,6 @@ async def setup_connection_params(
         context: Context,
         root_value: Optional[RootValue],
     ) -> None:
-        if connection_params is None:
-            return
-
         if isinstance(context, dict):
             context["connection_params"] = connection_params
         elif hasattr(context, "connection_params"):

src/graphql_server/subscriptions/protocols/graphql_transport_ws/handlers.py

@@ -296,13 +296,7 @@ async def run_operation(self, operation: Operation[Context, RootValue]) -> None:
                     operation_name=operation.operation_name,
                 )
 
-            # TODO: maybe change PreExecutionError to an exception that can be caught
-
             if isinstance(result_source, ExecutionResult):
-                # if isinstance(result_source, PreExecutionError):
-                #     assert result_source.errors
-                #     await operation.send_initial_errors(result_source.errors)
-                # else:
                 await operation.send_next(result_source)
             else:
                 is_first_result = True

src/graphql_server/subscriptions/protocols/graphql_ws/handlers.py

@@ -205,15 +205,27 @@ async def handle_async_results(
             from graphql_server.runtime import process_errors
 
             processed_errors = process_errors(e.errors)
+            # for error in e.errors:
+            error = e.errors[0]
             await self.send_message(
                 ErrorMessage(
                     type="error",
                     id=operation_id,
-                    payload={"message": str(e)},
+                    payload=error.formatted,
                 )
             )
         except asyncio.CancelledError:
             await self.send_message(CompleteMessage(type="complete", id=operation_id))
+        except Exception as e:
+            with suppress(Exception):
+                await self.send_message(
+                    ErrorMessage(
+                        type="error",
+                        id=operation_id,
+                        payload={"message": str(e)},
+                    )
+                )
+            raise
 
     async def cleanup_operation(self, operation_id: str) -> None:
         if operation_id in self.subscriptions:

src/tests/websockets/test_graphql_transport_ws.py

@@ -1095,14 +1095,14 @@ async def test_error_handler_for_timeout(http_client: HttpClient):
     """Test that the error handler is called when the timeout
     task encounters an error.
     """
-    with contextlib.suppress(ImportError):
-        from tests.http.clients.channels import ChannelsHttpClient
+    # with contextlib.suppress(ImportError):
+    #     from tests.http.clients.channels import ChannelsHttpClient
 
-        if isinstance(http_client, ChannelsHttpClient):
-            pytest.skip("Can't patch on_init for this client")
+    #     if isinstance(http_client, ChannelsHttpClient):
+    #         pytest.skip("Can't patch on_init for this client")
 
-    if not AsyncMock:
-        pytest.skip("Don't have AsyncMock")
+    # if not AsyncMock:
+    #     pytest.skip("Don't have AsyncMock")
 
     ws = ws_raw
     handler = None
@@ -1210,11 +1210,11 @@ async def test_unexpected_client_disconnects_are_gracefully_handled(
                 "payload": {"query": 'subscription { infinity(message: "Hi") }'},
             }
         )
-        await ws.receive(timeout=2)
+        await ws.receive(timeout=1)
         assert Subscription.active_infinity_subscriptions == 1
 
         await ws.close()
-        await asyncio.sleep(1)
+        await asyncio.sleep(0.5)
 
         assert not process_errors.called
         assert Subscription.active_infinity_subscriptions == 0

src/tests/websockets/test_graphql_ws.py

@@ -21,6 +21,7 @@
     ErrorMessage,
     StartMessage,
 )
+from tests.views.schema import Subscription
 
 if TYPE_CHECKING:
     from tests.http.clients.base import HttpClient, WebSocketClient
@@ -48,7 +49,7 @@ async def ws(ws_raw: WebSocketClient) -> AsyncGenerator[WebSocketClient, None]:
 
     await ws.send_legacy_message({"type": "connection_terminate"})
     # make sure the WebSocket is disconnected now
-    await ws.receive(timeout=2)  # receive close
+    await ws.receive(timeout=1)  # receive close
     assert ws.closed
 
 
@@ -400,7 +401,7 @@ async def test_subscription_errors(ws: WebSocketClient):
     data_message: DataMessage = await ws.receive_json()
     assert data_message["type"] == "data"
     assert data_message["id"] == "demo"
-    assert data_message["payload"]["data"] is None
+    assert data_message["payload"]["data"]["error"] is None
 
     assert "errors" in data_message["payload"]
     assert data_message["payload"]["errors"] is not None
@@ -653,7 +654,7 @@ async def test_resolving_enums(ws: WebSocketClient):
     assert complete_message["id"] == "demo"
 
 
-@pytest.mark.xfail(reason="flaky test")
+# @pytest.mark.xfail(reason="flaky test")
 async def test_task_cancellation_separation(http_client: HttpClient):
     # Note Python 3.7 does not support Task.get_name/get_coro so we have to use
     # repr(Task) to check whether expected tasks are running.
@@ -862,7 +863,7 @@ async def test_unexpected_client_disconnects_are_gracefully_handled(
         assert Subscription.active_infinity_subscriptions == 1
 
         await ws.close()
-        await asyncio.sleep(1)
+        await asyncio.sleep(0.5)
 
         assert not process_errors.called
         assert Subscription.active_infinity_subscriptions == 0