fix: resolve linting issues and regenerate sync files for GOAWAY tests (#2)

Author: bayoumi17m

httpcore/_sync/connection_pool.py

@@ -242,11 +242,10 @@ def handle_request(self, request: Request) -> Response:
                         pool_request.request
                     )
                 except ConnectionGoingAway as exc:
-                    # NOTE: This must be caught before ConnectionNotAvailable since
-                    # ConnectionGoingAway is a subclass of ConnectionNotAvailable.
-                    #
                     # GOAWAY frame recieved during request processing.
                     # Determine if we can safely retry based on RFC 7540 semantics.
+                    # NOTE: This must be caught before ConnectionNotAvailable since
+                    # ConnectionGoingAway is a subclass of ConnectionNotAvailable.
                     pool_request.clear_connection()
 
                     if exc.is_safe_to_retry:

tests/_async/test_http2_goaway.py

@@ -10,15 +10,17 @@
 4. Pool-level retry logic based on GOAWAY context
 5. Various race conditions between GOAWAY and request processing
 """
+
 from __future__ import annotations
 
+from typing import Any
+
 import hpack
 import hyperframe.frame
 import pytest
 
 import httpcore
 
-
 # =============================================================================
 # Tests for ConnectionGoingAway Exception Properties
 # =============================================================================
@@ -466,24 +468,11 @@ async def test_http2_draining_connection_goaway_after_complete_response():
         assert exc_info.value.is_safe_to_retry is True
 
 
-
-
 # =============================================================================
 # Custom Mock Backend for Retry Tests
 # =============================================================================
 
 
-class AsyncMockStreamWithFailure(httpcore.AsyncMockStream):
-    """A mock stream that can simulate different behaviors for testing retries."""
-
-    def __init__(self, buffers_by_connection: list[list[bytes]], http2: bool = False):
-        self._all_buffers = buffers_by_connection
-        self._connection_index = 0
-        super().__init__(
-            buffers_by_connection[0] if buffers_by_connection else [], http2=http2
-        )
-
-
 class AsyncMockBackendWithRetry(httpcore.AsyncMockBackend):
     """A mock backend that returns different data for each connection."""
 
@@ -499,8 +488,8 @@ async def connect_tcp(
         port: int,
         timeout: float | None = None,
         local_address: str | None = None,
-        socket_options=None,
-    ):
+        socket_options: Any = None,
+    ) -> httpcore.AsyncMockStream:
         if self._connection_index < len(self._all_buffers):
             buffer = list(self._all_buffers[self._connection_index])
             self._connection_index += 1
@@ -754,16 +743,15 @@ async def test_http2_goaway_connection_closed_after_graceful_goaway():
 # =============================================================================
 
 
-class MockConnectionGracefulGoaway:
+class MockConnectionGracefulGoaway(httpcore.AsyncConnectionInterface):
     """
     Mock connection that raises ConnectionGoingAway with specific properties
     to test the graceful shutdown + no side effects retry path.
     """
 
-    def __init__(self, origin: httpcore.Origin, succeed_on_retry: bool = True):
+    def __init__(self, origin: httpcore.Origin) -> None:
         self._origin = origin
         self._calls = 0
-        self._succeed_on_retry = succeed_on_retry
 
     def can_handle_request(self, origin: httpcore.Origin) -> bool:
         return origin == self._origin
@@ -780,7 +768,9 @@ def is_closed(self) -> bool:
     def has_expired(self) -> bool:
         return False
 
-    async def handle_async_request(self, request: httpcore.Request) -> httpcore.Response:
+    async def handle_async_request(
+        self, request: httpcore.Request
+    ) -> httpcore.Response:
         self._calls += 1
         if self._calls == 1:
             # First call: raise ConnectionGoingAway with:
@@ -796,16 +786,7 @@ async def handle_async_request(self, request: httpcore.Request) -> httpcore.Resp
                 headers_sent=False,  # no side effects
                 body_sent=False,
             )
-        if self._succeed_on_retry:
-            return httpcore.Response(200, content=b"Success after retry!")
-        raise httpcore.ConnectionGoingAway(
-            "Another GOAWAY",
-            last_stream_id=5,
-            error_code=0,
-            request_stream_id=1,
-            headers_sent=False,
-            body_sent=False,
-        )
+        return httpcore.Response(200, content=b"Success after retry!")
 
     async def aclose(self) -> None:
         pass
@@ -824,16 +805,17 @@ async def test_connection_pool_retries_graceful_shutdown_no_headers_sent():
 
     This tests line 258 in connection_pool.py.
     """
-    origin = httpcore.Origin(b"https", b"example.com", 443)
 
     # Create a custom pool that returns our mock connection
     class TestPool(httpcore.AsyncConnectionPool):
-        def __init__(self):
+        def __init__(self) -> None:
             super().__init__()
-            self._mock_connections: list = []
+            self._mock_connections: list[MockConnectionGracefulGoaway] = []
 
-        def create_connection(self, origin: httpcore.Origin):
-            conn = MockConnectionGracefulGoaway(origin, succeed_on_retry=True)
+        def create_connection(
+            self, origin: httpcore.Origin
+        ) -> MockConnectionGracefulGoaway:
+            conn = MockConnectionGracefulGoaway(origin)
             self._mock_connections.append(conn)
             return conn
 
@@ -843,6 +825,4 @@ def create_connection(self, origin: httpcore.Origin):
         assert response.content == b"Success after retry!"
 
         # Verify the first connection was called twice (retry happened)
-        assert pool._mock_connections[0]._calls == 2
-
-
+        assert pool._mock_connections[0]._calls == 2  # type: ignore[attr-defined]