Migrate tests to ypy-websockets 13

Author: hbcarlos

tests/conftest.py

@@ -32,9 +32,13 @@ async def yws_server(request):
         kwargs = request.param
     except Exception:
         kwargs = {}
+    
     websocket_server = WebsocketServer(**kwargs)
-    async with serve(websocket_server.serve, "localhost", 1234):
-        yield websocket_server
+    try:
+        async with websocket_server, serve(websocket_server.serve, "localhost", 1234):
+            yield websocket_server
+    except Exception:
+        pass
 
 
 @pytest.fixture

tests/test_ypy_yjs.py

@@ -53,13 +53,13 @@ def source(self):
 async def test_ypy_yjs_0(yws_server, yjs_client):
     ydoc = Y.YDoc()
     ynotebook = YNotebook(ydoc)
-    websocket = await connect("ws://localhost:1234/my-roomname")
-    WebsocketProvider(ydoc, websocket)
-    nb = stringify_source(json.loads((files_dir / "nb0.ipynb").read_text()))
-    ynotebook.source = nb
-    ytest = YTest(ydoc, 3.0)
-    await ytest.change()
-    assert ytest.source == nb
+
+    async with connect("ws://localhost:1234/my-roomname") as websocket, WebsocketProvider(ydoc, websocket):
+        nb = stringify_source(json.loads((files_dir / "nb0.ipynb").read_text()))
+        ynotebook.source = nb
+        ytest = YTest(ydoc, 3.0)
+        await ytest.change()
+        assert ytest.source == nb
 
 
 def test_plotly_renderer():