rename

Author: sanderegg

packages/pytest-simcore/src/pytest_simcore/helpers/playwright.py

@@ -137,7 +137,7 @@ def to_json(self) -> str:
 
 
 @dataclass
-class RestartableWebSocket:
+class RobustWebSocket:
     page: Page
     ws: WebSocket
     _registered_events: list[tuple[str, typing.Callable | None]] = field(
@@ -483,7 +483,7 @@ def assert_service_ready(self) -> None:
 def wait_for_pipeline_state(
     current_state: RunningState,
     *,
-    websocket: RestartableWebSocket,
+    websocket: RobustWebSocket,
     if_in_states: tuple[RunningState, ...],
     expected_states: tuple[RunningState, ...],
     timeout_ms: int,
@@ -540,7 +540,7 @@ def expected_service_running(
     *,
     page: Page,
     node_id: str,
-    websocket: RestartableWebSocket,
+    websocket: RobustWebSocket,
     timeout: int,
     press_start_button: bool,
     product_url: AnyUrl,
@@ -575,7 +575,7 @@ def wait_for_service_running(
     *,
     page: Page,
     node_id: str,
-    websocket: RestartableWebSocket,
+    websocket: RobustWebSocket,
     timeout: int,
     press_start_button: bool,
     product_url: AnyUrl,

packages/pytest-simcore/src/pytest_simcore/helpers/playwright_sim4life.py

@@ -14,7 +14,7 @@
     MINUTE,
     SECOND,
     SOCKETIO_MESSAGE_PREFIX,
-    RestartableWebSocket,
+    RobustWebSocket,
     SocketIOEvent,
     decode_socketio_42_message,
     wait_for_service_running,
@@ -102,7 +102,7 @@ class WaitForS4LDict(TypedDict):
 def wait_for_launched_s4l(
     page: Page,
     node_id,
-    log_in_and_out: RestartableWebSocket,
+    log_in_and_out: RobustWebSocket,
     *,
     autoscaled: bool,
     copy_workspace: bool,

tests/e2e-playwright/tests/conftest.py

@@ -29,7 +29,7 @@
     MINUTE,
     SECOND,
     AutoRegisteredUser,
-    RestartableWebSocket,
+    RobustWebSocket,
     RunningState,
     ServiceType,
     SocketIOEvent,
@@ -366,7 +366,7 @@ def log_in_and_out(
     register: Callable[[], AutoRegisteredUser],
     store_browser_context: bool,
     context: BrowserContext,
-) -> Iterator[RestartableWebSocket]:
+) -> Iterator[RobustWebSocket]:
     with log_context(
         logging.INFO,
         f"Open {product_url=} using {user_name=}/{user_password=}/{auto_register=} with {browser.browser_type.name}:{browser.version}({browser.browser_type.executable_path})",
@@ -410,7 +410,7 @@ def log_in_and_out(
                 assert response_info.value.ok, f"{response_info.value.json()}"
 
     assert not ws_info.value.is_closed()
-    restartable_wb = RestartableWebSocket.create(page, ws_info.value)
+    restartable_wb = RobustWebSocket.create(page, ws_info.value)
 
     # Welcome to Sim4Life
     page.wait_for_timeout(5000)
@@ -473,7 +473,7 @@ def _select_service_version(page: Page, *, version: str) -> None:
 @pytest.fixture
 def create_new_project_and_delete(  # noqa: C901, PLR0915
     page: Page,
-    log_in_and_out: RestartableWebSocket,
+    log_in_and_out: RobustWebSocket,
     is_product_billable: bool,
     api_request_context: APIRequestContext,
     product_url: AnyUrl,
@@ -735,7 +735,7 @@ def _(
 def start_and_stop_pipeline(
     product_url: AnyUrl,
     page: Page,
-    log_in_and_out: RestartableWebSocket,
+    log_in_and_out: RobustWebSocket,
     api_request_context: APIRequestContext,
 ) -> Iterator[Callable[[], SocketIOEvent]]:
     started_pipeline_ids = []

tests/e2e-playwright/tests/jupyterlabs/test_jupyterlab.py

@@ -20,7 +20,7 @@
 from pytest_simcore.helpers.playwright import (
     MINUTE,
     SECOND,
-    RestartableWebSocket,
+    RobustWebSocket,
     ServiceType,
     wait_for_service_running,
 )
@@ -63,7 +63,7 @@ def __call__(self, new_websocket: WebSocket) -> bool:
 
 def test_jupyterlab(
     page: Page,
-    log_in_and_out: RestartableWebSocket,
+    log_in_and_out: RobustWebSocket,
     create_project_from_service_dashboard: Callable[
         [ServiceType, str, str | None, str | None], dict[str, Any]
     ],
@@ -140,7 +140,7 @@ def test_jupyterlab(
                 iframe.get_by_label("Launcher").get_by_text("Terminal").click()
 
             assert not ws_info.value.is_closed()
-            restartable_terminal_web_socket = RestartableWebSocket.create(
+            restartable_terminal_web_socket = RobustWebSocket.create(
                 page, ws_info.value
             )
 

tests/e2e-playwright/tests/sim4life/test_sim4life.py

@@ -13,7 +13,7 @@
 
 from playwright.sync_api import Page
 from pydantic import AnyUrl
-from pytest_simcore.helpers.playwright import RestartableWebSocket, ServiceType
+from pytest_simcore.helpers.playwright import RobustWebSocket, ServiceType
 from pytest_simcore.helpers.playwright_sim4life import (
     check_video_streaming,
     interact_with_s4l,
@@ -27,7 +27,7 @@ def test_sim4life(
         [ServiceType, str, str | None, str | None], dict[str, Any]
     ],
     create_project_from_new_button: Callable[[str], dict[str, Any]],
-    log_in_and_out: RestartableWebSocket,
+    log_in_and_out: RobustWebSocket,
     service_key: str,
     service_version: str | None,
     use_plus_button: bool,

tests/e2e-playwright/tests/sim4life/test_template.py

@@ -13,7 +13,7 @@
 
 from playwright.sync_api import Page
 from pydantic import AnyUrl
-from pytest_simcore.helpers.playwright import RestartableWebSocket
+from pytest_simcore.helpers.playwright import RobustWebSocket
 from pytest_simcore.helpers.playwright_sim4life import (
     check_video_streaming,
     interact_with_s4l,
@@ -24,7 +24,7 @@
 def test_template(
     page: Page,
     create_project_from_template_dashboard: Callable[[str], dict[str, Any]],
-    log_in_and_out: RestartableWebSocket,
+    log_in_and_out: RobustWebSocket,
     template_id: str,
     is_autoscaled: bool,
     check_videostreaming: bool,

tests/e2e-playwright/tests/sleepers/test_sleepers.py

@@ -24,7 +24,7 @@
 )
 from pytest_simcore.helpers.playwright import (
     MINUTE,
-    RestartableWebSocket,
+    RobustWebSocket,
     RunningState,
     ServiceType,
     SocketIOEvent,
@@ -80,7 +80,7 @@ def _get_file_names(page: Page) -> list[str]:
 
 def test_sleepers(
     page: Page,
-    log_in_and_out: RestartableWebSocket,
+    log_in_and_out: RobustWebSocket,
     create_project_from_service_dashboard: Callable[
         [ServiceType, str, str | None, str | None], dict[str, Any]
     ],

tests/e2e-playwright/tests/tip/test_ti_plan.py

@@ -20,7 +20,7 @@
 from pytest_simcore.helpers.playwright import (
     MINUTE,
     SECOND,
-    RestartableWebSocket,
+    RobustWebSocket,
     app_mode_trigger_next_app,
     expected_service_running,
     wait_for_service_running,
@@ -91,7 +91,7 @@ def __call__(self, message: str) -> bool:
 
 def test_classic_ti_plan(  # noqa: PLR0915
     page: Page,
-    log_in_and_out: RestartableWebSocket,
+    log_in_and_out: RobustWebSocket,
     is_autoscaled: bool,
     is_product_lite: bool,
     create_tip_plan_from_dashboard: Callable[[str], dict[str, Any]],
@@ -222,7 +222,7 @@ def test_classic_ti_plan(  # noqa: PLR0915
             assert ti_iframe
 
         assert not ws_info.value.is_closed()
-        restartable_jlab_websocket = RestartableWebSocket.create(page, ws_info.value)
+        restartable_jlab_websocket = RobustWebSocket.create(page, ws_info.value)
 
         with (
             log_context(logging.INFO, "Run optimization"),