only check last error in display context

Author: rmorshea

idom/testing.py

@@ -31,16 +31,16 @@ def open_selenium_chrome_driver_and_display_context(
         page_load_timeout=driver_timeout,
         implicit_wait_timeout=driver_timeout,
     ) as driver:
-        with open_sanic_hotswap_mount_and_server(
+        mount, server = create_sanic_hotswap_mount_and_server(
             server_type=PerClientStateServer, host=host, port=port
-        ) as (mount, server):
-            time.sleep(wait_for_server_start)
-            yield (
-                driver,
-                create_selenium_page_get_and_display_context(
-                    driver, server, server_url, mount
-                )[1],
-            )
+        )
+        time.sleep(wait_for_server_start)
+        yield (
+            driver,
+            create_selenium_page_get_and_display_context(
+                driver, server, server_url, mount
+            )[1],
+        )
 
 
 def create_selenium_page_get_and_display_context(
@@ -91,52 +91,41 @@ def display_context():
     return get_page, display_context
 
 
-@contextmanager
-def open_sanic_multiview_mount_and_server(
+def create_sanic_multiview_mount_and_server(
     server_type: Type[SanicRenderServer],
     host: str,
     port: int,
     debug: bool = False,
     app: Optional[Sanic] = None,
-) -> Iterator[Tuple[MultiViewMount, SanicRenderServer]]:
-    server_type = create_sanic_server_type_for_testing(server_type)
-    try:
-        yield multiview_server(
-            server_type,
-            host,
-            port,
-            server_options={"cors": True},
-            run_options={"debug": debug},
-            app=app,
-        )
-    finally:
-        if server_type.last_server_error_for_idom_testing.current is not None:
-            raise server_type.last_server_error_for_idom_testing.current  # pragma: no cover
+) -> Tuple[MultiViewMount, SanicRenderServer]:
+    return multiview_server(
+        create_sanic_server_type_for_testing(server_type),
+        host,
+        port,
+        server_options={"cors": True},
+        run_options={"debug": debug},
+        app=app,
+    )
 
 
-@contextmanager
-def open_sanic_hotswap_mount_and_server(
+def create_sanic_hotswap_mount_and_server(
     server_type: Type[SanicRenderServer],
     host: str,
     port: int,
     sync_views: bool = False,
     debug: bool = False,
     app: Optional[Sanic] = None,
-) -> Iterator[Tuple[Callable[..., None], SanicRenderServer]]:
-    server_type = create_sanic_server_type_for_testing(server_type)
-    try:
-        yield hotswap_server(
-            server_type,
-            host,
-            port,
-            server_options={"cors": True},
-            run_options={"debug": debug},
-            sync_views=sync_views,
-            app=app,
-        )
-    finally:
-        if server_type.last_server_error_for_idom_testing.current is not None:
-            raise server_type.last_server_error_for_idom_testing.current
+) -> Tuple[Callable[..., None], SanicRenderServer]:
+
+    return hotswap_server(
+        create_sanic_server_type_for_testing(server_type),
+        host,
+        port,
+        server_options={"cors": True},
+        run_options={"debug": debug},
+        sync_views=sync_views,
+        app=app,
+    )
 
 
 def create_sanic_server_type_for_testing(

tests/conftest.py

@@ -22,7 +22,7 @@
 from idom.server.sanic import PerClientStateServer
 from idom.testing import (
     create_selenium_page_get_and_display_context,
-    open_sanic_hotswap_mount_and_server,
+    create_sanic_hotswap_mount_and_server,
     open_selenium_chrome_driver,
     SanicRenderServerWithLastError,
 )
@@ -149,10 +149,7 @@ def mount_and_server(
 
     The ``mount`` and ``server`` fixtures use this.
     """
-    with open_sanic_hotswap_mount_and_server(
-        PerClientStateServer, host=host, port=port
-    ) as mount_and_server:
-        yield mount_and_server
+    return create_sanic_hotswap_mount_and_server(PerClientStateServer, host, port)
 
 
 @pytest.fixture(scope="module")

tests/test_server/test_sanic/test_base.py

@@ -5,19 +5,18 @@
 
 import idom
 from idom.server.sanic import PerClientStateServer
-from idom.testing import open_sanic_multiview_mount_and_server
+from idom.testing import create_sanic_multiview_mount_and_server
 
 
 @pytest.fixture(scope="module")
 def mount_and_server(host, port):
-    with open_sanic_multiview_mount_and_server(
+    return create_sanic_multiview_mount_and_server(
         PerClientStateServer,
         host,
         port,
         # test that we can use a custom app instance
         app=Sanic(),
-    ) as mount_and_server:
-        yield mount_and_server
+    )
 
 
 def test_serve_has_loop_attribute(server):

tests/test_server/test_sanic/test_multiview_server.py

@@ -2,17 +2,14 @@
 
 import idom
 from idom.server.sanic import PerClientStateServer
-from idom.testing import open_sanic_multiview_mount_and_server
+from idom.testing import create_sanic_multiview_mount_and_server
 
 from tests.driver_utils import no_such_element
 
 
 @pytest.fixture(scope="module")
 def mount_and_server(host, port):
-    with open_sanic_multiview_mount_and_server(
-        PerClientStateServer, host, port
-    ) as mount_and_server:
-        yield mount_and_server
+    return create_sanic_multiview_mount_and_server(PerClientStateServer, host, port)
 
 
 def test_multiview_server(driver_get, driver, mount, server):

tests/test_server/test_sanic/test_shared_state_client.py

@@ -6,12 +6,7 @@
 
 import idom
 from idom.server.sanic import SharedClientStateServer
-from idom.testing import open_sanic_hotswap_mount_and_server
-
-
-@pytest.fixture(scope="module")
-def server_type():
-    return SharedClientStateServer
+from idom.testing import create_sanic_hotswap_mount_and_server
 
 
 @pytest.fixture(scope="module")
@@ -20,10 +15,9 @@ def mount_and_server(host, port):
 
     The ``mount`` and ``server`` fixtures use this.
     """
-    with open_sanic_hotswap_mount_and_server(
+    return create_sanic_hotswap_mount_and_server(
         SharedClientStateServer, host, port, sync_views=True
-    ) as mount_and_server:
-        yield mount_and_server
+    )
 
 
 def test_shared_client_state(create_driver, mount, server_url):