fix: handle http2 goaway race conditions (#4)

Author: bayoumi17m

tests/_async/test_http2_goaway.py

@@ -891,7 +891,7 @@ async def test_http2_server_disconnect_with_h2_closed_state():
     # Create a mock stream that sets state to CLOSED BEFORE returning empty data
     # This simulates the race condition accurately
     class MockStreamWithClosedStateOnDisconnect(httpcore.AsyncMockStream):
-        def __init__(self, conn_ref: list) -> None:
+        def __init__(self, conn_ref: list[httpcore.AsyncHTTP2Connection]) -> None:
             self._conn_ref = conn_ref
             self._read_count = 0
             super().__init__([hyperframe.frame.SettingsFrame().serialize()], http2=True)
@@ -900,7 +900,7 @@ async def read(self, max_bytes: int, timeout: float | None = None) -> bytes:
             self._read_count += 1
             if self._read_count == 1:
                 # First read returns settings
-                return hyperframe.frame.SettingsFrame().serialize()
+                return bytes(hyperframe.frame.SettingsFrame().serialize())
             # Before returning empty (disconnect), set h2 state to CLOSED
             # This simulates h2 having processed GOAWAY internally
             if self._conn_ref and self._conn_ref[0]:
@@ -910,7 +910,7 @@ async def read(self, max_bytes: int, timeout: float | None = None) -> bytes:
                 self._conn_ref[0]._connection_terminated = None
             return b""  # Server disconnect
 
-    conn_ref: list = []
+    conn_ref: list[httpcore.AsyncHTTP2Connection] = []
     stream = MockStreamWithClosedStateOnDisconnect(conn_ref)
 
     async with httpcore.AsyncHTTP2Connection(
@@ -958,7 +958,7 @@ async def test_http2_protocol_error_with_h2_closed_state():
     # Create a mock stream that sets state to CLOSED during write
     # This causes h2 to raise ProtocolError when trying to read the next frame
     class MockStreamWithClosedOnWrite(httpcore.AsyncMockStream):
-        def __init__(self, conn_ref: list) -> None:
+        def __init__(self, conn_ref: list[httpcore.AsyncHTTP2Connection]) -> None:
             self._conn_ref = conn_ref
             self._write_count = 0
             super().__init__([hyperframe.frame.SettingsFrame().serialize()], http2=True)
@@ -973,7 +973,7 @@ async def write(self, data: bytes, timeout: float | None = None) -> None:
                 ]._h2_state.state_machine.state = h2.connection.ConnectionState.CLOSED
                 self._conn_ref[0]._connection_terminated = None
 
-    conn_ref: list = []
+    conn_ref: list[httpcore.AsyncHTTP2Connection] = []
     stream = MockStreamWithClosedOnWrite(conn_ref)
 
     async with httpcore.AsyncHTTP2Connection(

tests/_sync/test_http2_goaway.py

@@ -891,7 +891,7 @@ def test_http2_server_disconnect_with_h2_closed_state():
     # Create a mock stream that sets state to CLOSED BEFORE returning empty data
     # This simulates the race condition accurately
     class MockStreamWithClosedStateOnDisconnect(httpcore.MockStream):
-        def __init__(self, conn_ref: list) -> None:
+        def __init__(self, conn_ref: list[httpcore.HTTP2Connection]) -> None:
             self._conn_ref = conn_ref
             self._read_count = 0
             super().__init__([hyperframe.frame.SettingsFrame().serialize()], http2=True)
@@ -900,7 +900,7 @@ def read(self, max_bytes: int, timeout: float | None = None) -> bytes:
             self._read_count += 1
             if self._read_count == 1:
                 # First read returns settings
-                return hyperframe.frame.SettingsFrame().serialize()
+                return bytes(hyperframe.frame.SettingsFrame().serialize())
             # Before returning empty (disconnect), set h2 state to CLOSED
             # This simulates h2 having processed GOAWAY internally
             if self._conn_ref and self._conn_ref[0]:
@@ -910,7 +910,7 @@ def read(self, max_bytes: int, timeout: float | None = None) -> bytes:
                 self._conn_ref[0]._connection_terminated = None
             return b""  # Server disconnect
 
-    conn_ref: list = []
+    conn_ref: list[httpcore.HTTP2Connection] = []
     stream = MockStreamWithClosedStateOnDisconnect(conn_ref)
 
     with httpcore.HTTP2Connection(
@@ -958,7 +958,7 @@ def test_http2_protocol_error_with_h2_closed_state():
     # Create a mock stream that sets state to CLOSED during write
     # This causes h2 to raise ProtocolError when trying to read the next frame
     class MockStreamWithClosedOnWrite(httpcore.MockStream):
-        def __init__(self, conn_ref: list) -> None:
+        def __init__(self, conn_ref: list[httpcore.HTTP2Connection]) -> None:
             self._conn_ref = conn_ref
             self._write_count = 0
             super().__init__([hyperframe.frame.SettingsFrame().serialize()], http2=True)
@@ -973,7 +973,7 @@ def write(self, data: bytes, timeout: float | None = None) -> None:
                 ]._h2_state.state_machine.state = h2.connection.ConnectionState.CLOSED
                 self._conn_ref[0]._connection_terminated = None
 
-    conn_ref: list = []
+    conn_ref: list[httpcore.HTTP2Connection] = []
     stream = MockStreamWithClosedOnWrite(conn_ref)
 
     with httpcore.HTTP2Connection(