fix test_automatic_reconnect test

Author: Archmonger

src/reactpy/testing/backend.py

@@ -60,6 +60,7 @@ def __init__(
                 app=self._app, host=self.host, port=self.port, loop="asyncio"
             )
         )
+        self.webserver_thread: Thread
 
     @property
     def log_records(self) -> list[logging.LogRecord]:
@@ -109,9 +110,10 @@ def list_logged_exceptions(
     async def __aenter__(self) -> BackendFixture:
         self._exit_stack = AsyncExitStack()
         self._records = self._exit_stack.enter_context(capture_reactpy_logs())
-        Thread(target=self.webserver.run, daemon=True).start()
 
         # Wait for the server to start
+        self.webserver_thread: Thread = Thread(target=self.webserver.run, daemon=True)
+        self.webserver_thread.start()
         await asyncio.sleep(1)
 
         return self
@@ -131,7 +133,15 @@ async def __aexit__(
             msg = "Unexpected logged exception"
             raise LogAssertionError(msg) from logged_errors[0]
 
-        await asyncio.wait_for(self.webserver.shutdown(), timeout=5)
+        await asyncio.wait_for(
+            self.webserver.shutdown(), timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
+        )
+        self.webserver_thread.join(timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current)
+
+    async def restart(self) -> None:
+        """Restart the server"""
+        await self.__aexit__(None, None, None)
+        await self.__aenter__()
 
 
 _MountFunc = Callable[["Callable[[], Any] | None"], None]

tests/test_client.py

@@ -2,7 +2,7 @@
 from contextlib import AsyncExitStack
 from pathlib import Path
 
-from playwright.async_api import Browser
+from playwright.async_api import Page
 
 import reactpy
 from reactpy.testing import BackendFixture, DisplayFixture, poll
@@ -13,13 +13,9 @@
 JS_DIR = Path(__file__).parent / "js"
 
 
-async def test_automatic_reconnect(browser: Browser):
-    port = find_available_port("localhost")
-    page = await browser.new_page()
-
-    # we need to wait longer here because the automatic reconnect is not instant
-    page.set_default_timeout(10000)
-
+async def test_automatic_reconnect(
+    display: DisplayFixture, page: Page, server: BackendFixture
+):
     @reactpy.component
     def SomeComponent():
         count, incr_count = use_counter(0)
@@ -35,39 +31,34 @@ async def get_count():
         count = await page.wait_for_selector("#count")
         return await count.get_attribute("data-count")
 
-    async with AsyncExitStack() as exit_stack:
-        server = await exit_stack.enter_async_context(BackendFixture(port=port))
-        display = await exit_stack.enter_async_context(
-            DisplayFixture(server, driver=page)
-        )
-
-        await display.show(SomeComponent)
-
-        incr = await page.wait_for_selector("#incr")
+    await display.show(SomeComponent)
 
-        for i in range(3):
-            await poll(get_count).until_equals(str(i))
-            await incr.click()
+    await poll(get_count).until_equals("0")
+    incr = await page.wait_for_selector("#incr")
+    await incr.click()
 
-    # the server is disconnected but the last view state is still shown
-    await page.wait_for_selector("#count")
+    await poll(get_count).until_equals("1")
+    incr = await page.wait_for_selector("#incr")
+    await incr.click()
 
-    async with AsyncExitStack() as exit_stack:
-        server = await exit_stack.enter_async_context(BackendFixture(port=port))
-        display = await exit_stack.enter_async_context(
-            DisplayFixture(server, driver=page)
-        )
+    await poll(get_count).until_equals("2")
+    incr = await page.wait_for_selector("#incr")
+    await incr.click()
 
-        # use mount instead of show to avoid a page refresh
-        display.backend.mount(SomeComponent)
+    await server.restart()
+    await display.show(SomeComponent)
 
-        for i in range(3):
-            await poll(get_count).until_equals(str(i))
+    await poll(get_count).until_equals("0")
+    incr = await page.wait_for_selector("#incr")
+    await incr.click()
 
-            # need to refetch element because may unmount on reconnect
-            incr = await page.wait_for_selector("#incr")
+    await poll(get_count).until_equals("1")
+    incr = await page.wait_for_selector("#incr")
+    await incr.click()
 
-            await incr.click()
+    await poll(get_count).until_equals("2")
+    incr = await page.wait_for_selector("#incr")
+    await incr.click()
 
 
 async def test_style_can_be_changed(display: DisplayFixture):