Adjust NoopLifespan to return EstablishedConnectionResult and update tests accordingly

Author: vrslev

packages/stompman/test_stompman/conftest.py

@@ -8,7 +8,7 @@
 import stompman
 from polyfactory.factories.dataclass_factory import DataclassFactory
 from stompman.connection import AbstractConnection
-from stompman.connection_lifespan import AbstractConnectionLifespan
+from stompman.connection_lifespan import AbstractConnectionLifespan, EstablishedConnectionResult
 from stompman.connection_manager import ConnectionManager
 
 
@@ -59,7 +59,9 @@ class NoopLifespan(AbstractConnectionLifespan):
     connection: AbstractConnection
     connection_parameters: stompman.ConnectionParameters
 
-    async def enter(self) -> stompman.StompProtocolConnectionIssue | None: ...
+    async def enter(self) -> EstablishedConnectionResult | stompman.StompProtocolConnectionIssue:
+        return EstablishedConnectionResult(server_heartbeat=stompman.Heartbeat(1000, 1000))
+
     async def exit(self) -> None: ...
 
 
@@ -76,6 +78,7 @@ class EnrichedConnectionManager(ConnectionManager):
     read_max_chunk_size: int = 5
     write_retry_attempts: int = 3
     ssl: Literal[True] | SSLContext | None = None
+    check_server_alive_interval_factor: int = 3
 
 
 DataclassType = TypeVar("DataclassType")

packages/stompman/test_stompman/test_connection_manager.py

@@ -14,11 +14,13 @@
     ErrorFrame,
     FailedAllConnectAttemptsError,
     FailedAllWriteAttemptsError,
+    Heartbeat,
     MessageFrame,
 )
+from stompman.connection_lifespan import EstablishedConnectionResult
 from stompman.connection_manager import ActiveConnectionState
 
-from test_stompman.conftest import BaseMockConnection, EnrichedConnectionManager, NoopLifespan, build_dataclass
+from test_stompman.conftest import BaseMockConnection, EnrichedConnectionManager, build_dataclass
 
 pytestmark = [pytest.mark.anyio, pytest.mark.usefixtures("mock_sleep")]
 
@@ -110,8 +112,7 @@ async def connect(
     )
     active_connection_state = await manager._create_connection_to_any_server()
     assert active_connection_state
-    assert isinstance(active_connection_state.lifespan, NoopLifespan)
-    assert active_connection_state.lifespan.connection_parameters == successful_server
+    assert active_connection_state[1] == successful_server
 
 
 async def test_connect_to_any_server_fails() -> None:
@@ -169,7 +170,8 @@ class MockConnection(BaseMockConnection):
 
 
 async def test_get_active_connection_state_ok_concurrent() -> None:
-    enter = mock.AsyncMock(return_value=None)
+    server_heartbeat = build_dataclass(Heartbeat)
+    enter = mock.AsyncMock(return_value=EstablishedConnectionResult(server_heartbeat=server_heartbeat))
     lifespan_factory = mock.Mock(return_value=mock.Mock(enter=enter))
     manager = EnrichedConnectionManager(lifespan_factory=lifespan_factory, connection_class=BaseMockConnection)
 
@@ -185,7 +187,9 @@ async def test_get_active_connection_state_ok_concurrent() -> None:
         == second_state
         == third_state
         == fourth_state
-        == ActiveConnectionState(connection=BaseMockConnection(), lifespan=lifespan_factory.return_value)
+        == ActiveConnectionState(
+            connection=BaseMockConnection(), lifespan=lifespan_factory.return_value, server_heartbeat=server_heartbeat
+        )
     )
     assert first_state is second_state is third_state is fourth_state