test: satisfy pyright + branch coverage for SSE cleanup

Author: Epochex

tests/client/test_streamable_http_response_cleanup.py

@@ -1,11 +1,11 @@
 import contextlib
 
-import anyio
 import httpx
 import pytest
 from httpx_sse import ServerSentEvent
 
 from mcp.client.streamable_http import RequestContext, StreamableHTTPTransport
+from mcp.shared._context_streams import create_context_streams
 from mcp.shared.message import ClientMessageMetadata, SessionMessage
 from mcp.types import JSONRPCRequest
 
@@ -32,7 +32,7 @@ async def spy_aclose() -> None:
 
     monkeypatch.setattr("mcp.client.streamable_http.EventSource", _RaiseEventSource)
 
-    send_stream, receive_stream = anyio.create_memory_object_stream[SessionMessage | Exception](1)
+    send_stream, receive_stream = create_context_streams[SessionMessage | Exception](1)
     async with send_stream, receive_stream:
         transport = StreamableHTTPTransport("http://example.invalid/mcp")
         async with httpx.AsyncClient(transport=httpx.MockTransport(lambda _: httpx.Response(200))) as client:
@@ -53,13 +53,13 @@ async def test_handle_resumption_request_closes_response_when_aconnect_sse_raise
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     @contextlib.asynccontextmanager
-    async def fake_aconnect_sse(*_args, **_kwargs):
+    async def fake_aconnect_sse(*_args: object, **_kwargs: object):
         raise RuntimeError("connect failed")
         yield
 
     monkeypatch.setattr("mcp.client.streamable_http.aconnect_sse", fake_aconnect_sse)
 
-    send_stream, receive_stream = anyio.create_memory_object_stream[SessionMessage | Exception](1)
+    send_stream, receive_stream = create_context_streams[SessionMessage | Exception](1)
     async with send_stream, receive_stream:
         transport = StreamableHTTPTransport("http://example.invalid/mcp")
         metadata = ClientMessageMetadata(resumption_token="1")
@@ -72,8 +72,14 @@ async def fake_aconnect_sse(*_args, **_kwargs):
                 read_stream_writer=send_stream,
             )
 
-            with pytest.raises(RuntimeError, match="connect failed"):
+            error: RuntimeError | None = None
+            try:
                 await transport._handle_resumption_request(ctx)
+            except RuntimeError as exc:
+                error = exc
+
+            assert error is not None
+            assert str(error) == "connect failed"
 
 
 @pytest.mark.anyio
@@ -92,12 +98,12 @@ async def spy_aclose() -> None:
     response.aclose = spy_aclose  # type: ignore[method-assign]
 
     @contextlib.asynccontextmanager
-    async def fake_aconnect_sse(*_args, **_kwargs):
+    async def fake_aconnect_sse(*_args: object, **_kwargs: object):
         yield _RaiseEventSource(response)
 
     monkeypatch.setattr("mcp.client.streamable_http.aconnect_sse", fake_aconnect_sse)
 
-    send_stream, receive_stream = anyio.create_memory_object_stream[SessionMessage | Exception](1)
+    send_stream, receive_stream = create_context_streams[SessionMessage | Exception](1)
     async with send_stream, receive_stream:
         transport = StreamableHTTPTransport("http://example.invalid/mcp")
         metadata = ClientMessageMetadata(resumption_token="1")
@@ -110,7 +116,13 @@ async def fake_aconnect_sse(*_args, **_kwargs):
                 read_stream_writer=send_stream,
             )
 
-            with pytest.raises(RuntimeError, match="boom"):
+            error: RuntimeError | None = None
+            try:
                 await transport._handle_resumption_request(ctx)
+            except RuntimeError as exc:
+                error = exc
+
+            assert error is not None
+            assert str(error) == "boom"
 
     assert closed