undo local fixture change

Author: jackyzha0

tests/river_fixtures/clientserver.py

@@ -1,4 +1,3 @@
-import asyncio
 import logging
 from typing import AsyncGenerator, Literal
 
@@ -38,37 +37,31 @@ async def client(
     transport_options: TransportOptions,
     no_logging_error: NoErrors,
 ) -> AsyncGenerator[Client, None]:
-    binding = None
     try:
-        binding = await serve(server.serve, "127.0.0.1")
-        sockets = list(binding.sockets)
-        assert len(sockets) == 1, "Too many sockets!"
-        socket = sockets[0]
+        async with serve(server.serve, "127.0.0.1") as binding:
+            sockets = list(binding.sockets)
+            assert len(sockets) == 1, "Too many sockets!"
+            socket = sockets[0]
 
-        async def websocket_uri_factory() -> UriAndMetadata[None]:
-            return {
-                "uri": "ws://%s:%d" % socket.getsockname(),
-                "metadata": None,
-            }
-
-        client: Client[Literal[None]] = Client[None](
-            uri_and_metadata_factory=websocket_uri_factory,
-            client_id="test_client",
-            server_id="test_server",
-            transport_options=transport_options,
-        )
-        try:
-            yield client
-        finally:
-            logging.debug("Start closing test client : %s", "test_client")
-            await client.close()
+            async def websocket_uri_factory() -> UriAndMetadata[None]:
+                return {
+                    "uri": "ws://%s:%d" % socket.getsockname(),
+                    "metadata": None,
+                }
 
+            client: Client[Literal[None]] = Client[None](
+                uri_and_metadata_factory=websocket_uri_factory,
+                client_id="test_client",
+                server_id="test_server",
+                transport_options=transport_options,
+            )
+            try:
+                yield client
+            finally:
+                logging.debug("Start closing test client : %s", "test_client")
+                await client.close()
     finally:
         logging.debug("Start closing test server")
-        if binding:
-            binding.close()
         await server.close()
-        if binding:
-            await binding.wait_closed()
         # Server should close normally
-        no_logging_error()
+        no_logging_error()