Moving fixtures out

Author: blast-hardcheese

tests/conftest.py

@@ -18,6 +18,7 @@
     "tests.v1.river_fixtures.logging",
     "tests.v1.river_fixtures.clientserver",
     "tests.v2.fixtures.bound_client",
+    "tests.v2.fixtures.raw_ws_server",
 ]
 
 HandlerKind = Literal["rpc", "subscription-stream", "upload-stream", "stream"]

tests/v2/fixtures/raw_ws_server.py

@@ -0,0 +1,86 @@
+import asyncio
+from typing import (
+    AsyncIterator,
+    Awaitable,
+    Callable,
+    TypeAlias,
+    TypedDict,
+)
+
+import pytest
+from websockets import ConnectionClosed, ConnectionClosedOK, Data
+from websockets.asyncio.server import ServerConnection, serve
+
+from replit_river.transport_options import UriAndMetadata
+
+WsServerFixture: TypeAlias = tuple[
+    Callable[[], Awaitable[UriAndMetadata[None]]],
+    asyncio.Queue[bytes],
+    Callable[[], ServerConnection | None],
+]
+
+
+class _WsServerState(TypedDict):
+    ipv4_laddr: tuple[str, int] | None
+
+
+async def _ws_server_internal(
+    recv: asyncio.Queue[bytes],
+    set_conn: Callable[[ServerConnection], None],
+    state: _WsServerState,
+) -> AsyncIterator[None]:
+    async def handle(websocket: ServerConnection) -> None:
+        set_conn(websocket)
+        datagram: Data
+        try:
+            while datagram := await websocket.recv(decode=False):
+                if isinstance(datagram, str):
+                    continue
+                await recv.put(datagram)
+        except ConnectionClosedOK:
+            pass
+        except ConnectionClosed:
+            pass
+
+    port: int | None = None
+    if state["ipv4_laddr"]:
+        port = state["ipv4_laddr"][1]
+    async with serve(handle, "localhost", port=port) as server:
+        for sock in server.sockets:
+            if (pair := sock.getsockname())[0] == "127.0.0.1":
+                if state["ipv4_laddr"] is None:
+                    state["ipv4_laddr"] = pair
+        serve_forever = asyncio.create_task(server.serve_forever())
+        yield None
+        server.close()
+        await server.wait_closed()
+        # "serve_forever" should always be done after wait_closed finishes
+        assert serve_forever.done()
+
+
+@pytest.fixture
+async def ws_server() -> AsyncIterator[WsServerFixture]:
+    recv: asyncio.Queue[bytes] = asyncio.Queue(maxsize=1)
+    connection: ServerConnection | None = None
+    state: _WsServerState = {"ipv4_laddr": None}
+
+    def set_conn(new_conn: ServerConnection) -> None:
+        nonlocal connection
+        connection = new_conn
+
+    server_generator = _ws_server_internal(recv, set_conn, state)
+    await anext(server_generator)
+
+    async def urimeta() -> UriAndMetadata[None]:
+        ipv4_laddr = state["ipv4_laddr"]
+        assert ipv4_laddr
+        return UriAndMetadata(uri="ws://%s:%d" % ipv4_laddr, metadata=None)
+
+    yield (urimeta, recv, lambda: connection)
+
+    connection = None
+
+    try:
+        await anext(server_generator)
+    except StopAsyncIteration:
+        pass

tests/v2/test_v2_session_lifecycle.py

@@ -29,6 +29,7 @@
 from replit_river.transport_options import TransportOptions, UriAndMetadata
 from replit_river.v2.client import Client
 from replit_river.v2.session import STREAM_CANCEL_BIT, STREAM_CLOSED_BIT, Session
+from tests.v2.fixtures.raw_ws_server import WsServerFixture
 
 
 class OuterPayload[A](TypedDict):
@@ -50,79 +51,6 @@ def consume_budget(self, user: str) -> None:
         pass
 
 
-WsServerFixture: TypeAlias = tuple[
-    Callable[[], Awaitable[UriAndMetadata[None]]],
-    asyncio.Queue[bytes],
-    Callable[[], ServerConnection | None],
-]
-
-
-class _WsServerState(TypedDict):
-    ipv4_laddr: tuple[str, int] | None
-
-
-async def _ws_server_internal(
-    recv: asyncio.Queue[bytes],
-    set_conn: Callable[[ServerConnection], None],
-    state: _WsServerState,
-) -> AsyncIterator[None]:
-    async def handle(websocket: ServerConnection) -> None:
-        set_conn(websocket)
-        datagram: Data
-        try:
-            while datagram := await websocket.recv(decode=False):
-                if isinstance(datagram, str):
-                    continue
-                await recv.put(datagram)
-        except ConnectionClosedOK:
-            pass
-        except ConnectionClosed:
-            pass
-
-    port: int | None = None
-    if state["ipv4_laddr"]:
-        port = state["ipv4_laddr"][1]
-    async with serve(handle, "localhost", port=port) as server:
-        for sock in server.sockets:
-            if (pair := sock.getsockname())[0] == "127.0.0.1":
-                if state["ipv4_laddr"] is None:
-                    state["ipv4_laddr"] = pair
-        serve_forever = asyncio.create_task(server.serve_forever())
-        yield None
-        server.close()
-        await server.wait_closed()
-        # "serve_forever" should always be done after wait_closed finishes
-        assert serve_forever.done()
-
-
-@pytest.fixture
-async def ws_server() -> AsyncIterator[WsServerFixture]:
-    recv: asyncio.Queue[bytes] = asyncio.Queue(maxsize=1)
-    connection: ServerConnection | None = None
-    state: _WsServerState = {"ipv4_laddr": None}
-
-    def set_conn(new_conn: ServerConnection) -> None:
-        nonlocal connection
-        connection = new_conn
-
-    server_generator = _ws_server_internal(recv, set_conn, state)
-    await anext(server_generator)
-
-    async def urimeta() -> UriAndMetadata[None]:
-        ipv4_laddr = state["ipv4_laddr"]
-        assert ipv4_laddr
-        return UriAndMetadata(uri="ws://%s:%d" % ipv4_laddr, metadata=None)
-
-    yield (urimeta, recv, lambda: connection)
-
-    connection = None
-
-    try:
-        await anext(server_generator)
-    except StopAsyncIteration:
-        pass
-
-
 async def test_connect(ws_server: WsServerFixture) -> None:
     (urimeta, recv, conn) = ws_server