rename

Author: sanderegg

packages/pytest-simcore/src/pytest_simcore/socketio_client.py

@@ -51,7 +51,7 @@ async def _create(client_override: TestClient | None = None) -> str:
 
 
 @pytest.fixture
-async def socketio_client_factory(
+async def create_socketio_connection(
     socketio_url_factory: Callable[[TestClient | None], str],
     security_cookie_factory: Callable[[TestClient | None], Awaitable[str]],
     client_session_id_factory: Callable[[], str],

services/web/server/tests/integration/01/test_garbage_collection.py

@@ -516,7 +516,7 @@ async def assert_one_owner_for_project(
 async def test_t1_while_guest_is_connected_no_resources_are_removed(
     disable_garbage_collector_task: None,
     client: TestClient,
-    socketio_client_factory: Callable,
+    create_socketio_connection: Callable,
     aiopg_engine: aiopg.sa.engine.Engine,
     tests_data_dir: Path,
     osparc_product_name: str,
@@ -535,7 +535,7 @@ async def test_t1_while_guest_is_connected_no_resources_are_removed(
     await assert_users_count(aiopg_engine, 1)
     await assert_projects_count(aiopg_engine, 1)
 
-    await connect_to_socketio(client, logged_guest_user, socketio_client_factory)
+    await connect_to_socketio(client, logged_guest_user, create_socketio_connection)
     await asyncio.sleep(SERVICE_DELETION_DELAY + 1)
     await gc_core.collect_garbage(app=client.app)
 
@@ -547,7 +547,7 @@ async def test_t1_while_guest_is_connected_no_resources_are_removed(
 async def test_t2_cleanup_resources_after_browser_is_closed(
     disable_garbage_collector_task: None,
     client: TestClient,
-    socketio_client_factory: Callable,
+    create_socketio_connection: Callable,
     aiopg_engine: aiopg.sa.engine.Engine,
     tests_data_dir: Path,
     osparc_product_name: str,
@@ -567,7 +567,7 @@ async def test_t2_cleanup_resources_after_browser_is_closed(
     await assert_projects_count(aiopg_engine, 1)
 
     sio_connection_data = await connect_to_socketio(
-        client, logged_guest_user, socketio_client_factory
+        client, logged_guest_user, create_socketio_connection
     )
     await asyncio.sleep(SERVICE_DELETION_DELAY + 1)
     await gc_core.collect_garbage(app=client.app)
@@ -600,7 +600,7 @@ async def test_t2_cleanup_resources_after_browser_is_closed(
 
 async def test_t3_gc_will_not_intervene_for_regular_users_and_their_resources(
     client: TestClient,
-    socketio_client_factory: Callable,
+    create_socketio_connection: Callable,
     aiopg_engine: aiopg.sa.engine.Engine,
     fake_project: dict,
     tests_data_dir: Path,
@@ -642,7 +642,7 @@ async def assert_projects_and_users_are_present() -> None:
 
     # connect the user and wait for gc
     sio_connection_data = await connect_to_socketio(
-        client, logged_user, socketio_client_factory
+        client, logged_user, create_socketio_connection
     )
     await asyncio.sleep(WAIT_FOR_COMPLETE_GC_CYCLE)
 

services/web/server/tests/integration/02/notifications/test_rabbitmq_consumers.py

@@ -207,7 +207,7 @@ async def test_log_workflow(
     client: TestClient,
     rabbitmq_publisher: RabbitMQClient,
     subscribe_to_logs: bool,
-    socketio_client_factory: Callable[
+    create_socketio_connection: Callable[
         [str | None, TestClient | None], Awaitable[socketio.AsyncClient]
     ],
     # user
@@ -223,7 +223,7 @@ async def test_log_workflow(
     RabbitMQ (TOPIC) --> Webserver --> Redis --> webclient (socketio)
 
     """
-    socket_io_conn = await socketio_client_factory(None, client)
+    socket_io_conn = await create_socketio_connection(None, client)
 
     mock_log_handler = mocker.MagicMock()
     socket_io_conn.on(SOCKET_IO_LOG_EVENT, handler=mock_log_handler)
@@ -315,7 +315,7 @@ async def test_log_workflow_only_receives_messages_if_subscribed(
 async def test_progress_non_computational_workflow(
     client: TestClient,
     rabbitmq_publisher: RabbitMQClient,
-    socketio_client_factory: Callable[
+    create_socketio_connection: Callable[
         [str | None, TestClient | None], Awaitable[socketio.AsyncClient]
     ],
     subscribe_to_logs: bool,
@@ -332,7 +332,7 @@ async def test_progress_non_computational_workflow(
     RabbitMQ (TOPIC) --> Webserver -->  Redis --> webclient (socketio)
 
     """
-    socket_io_conn = await socketio_client_factory(None, client)
+    socket_io_conn = await create_socketio_connection(None, client)
 
     mock_progress_handler = mocker.MagicMock()
     socket_io_conn.on(
@@ -373,7 +373,7 @@ async def test_progress_computational_workflow(
     client: TestClient,
     rabbitmq_publisher: RabbitMQClient,
     user_project: ProjectDict,
-    socketio_client_factory: Callable[
+    create_socketio_connection: Callable[
         [str | None, TestClient | None], Awaitable[socketio.AsyncClient]
     ],
     mocker: MockerFixture,
@@ -391,7 +391,7 @@ async def test_progress_computational_workflow(
                                         Redis --> webclient (socketio)
 
     """
-    socket_io_conn = await socketio_client_factory(None, client)
+    socket_io_conn = await create_socketio_connection(None, client)
 
     mock_progress_handler = mocker.MagicMock()
     socket_io_conn.on(SOCKET_IO_NODE_UPDATED_EVENT, handler=mock_progress_handler)
@@ -498,7 +498,7 @@ async def test_event_workflow(
     mocker: MockerFixture,
     client: TestClient,
     rabbitmq_publisher: RabbitMQClient,
-    socketio_client_factory: Callable[
+    create_socketio_connection: Callable[
         [str | None, TestClient | None], Awaitable[socketio.AsyncClient]
     ],
     # user
@@ -512,7 +512,7 @@ async def test_event_workflow(
     RabbitMQ --> Webserver --> Redis --> webclient (socketio)
 
     """
-    socket_io_conn = await socketio_client_factory(None, client)
+    socket_io_conn = await create_socketio_connection(None, client)
     mock_event_handler = mocker.MagicMock()
     socket_io_conn.on(SOCKET_IO_EVENT, handler=mock_event_handler)
 

services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__delete.py

@@ -142,7 +142,7 @@ async def test_delete_multiple_opened_project_forbidden(
     user_project: ProjectDict,
     mocked_dynamic_services_interface,
     create_dynamic_service_mock: Callable[..., Awaitable[DynamicServiceGet]],
-    socketio_client_factory: Callable,
+    create_socketio_connection: Callable,
     client_session_id_factory: Callable[[], str],
     user_role: UserRole,
     expected_ok: HTTPStatus,
@@ -157,7 +157,7 @@ async def test_delete_multiple_opened_project_forbidden(
     # open project in tab1
     client_session_id1 = client_session_id_factory()
     try:
-        await socketio_client_factory(client_session_id1)
+        await create_socketio_connection(client_session_id1)
     except SocketConnectionError:
         if user_role != UserRole.ANONYMOUS:
             pytest.fail("socket io connection should not fail")
@@ -176,7 +176,7 @@ async def test_delete_multiple_opened_project_forbidden(
     # delete project in tab2
     client_session_id2 = client_session_id_factory()
     try:
-        await socketio_client_factory(client_session_id2)
+        await create_socketio_connection(client_session_id2)
     except SocketConnectionError:
         if user_role != UserRole.ANONYMOUS:
             pytest.fail("socket io connection should not fail")

services/web/server/tests/unit/with_dbs/02/test_projects_states_handlers.py

@@ -170,19 +170,17 @@ class _SocketHandlers(TypedDict):
 
 @pytest.fixture
 async def create_socketio_connection_with_handlers(
-    socketio_client_factory: Callable[
+    create_socketio_connection: Callable[
         [str | None, TestClient | None], Awaitable[socketio.AsyncClient]
     ],
     mocker: MockerFixture,
 ) -> Callable[
     [TestClient, str], Awaitable[tuple[socketio.AsyncClient, _SocketHandlers]]
 ]:
-    connected_sockets = []
-
     async def _(
         client: TestClient, client_id: str
     ) -> tuple[socketio.AsyncClient, _SocketHandlers]:
-        sio = await socketio_client_factory(client_id, client)
+        sio = await create_socketio_connection(client_id, client)
         assert sio.sid
 
         event_handlers = _SocketHandlers(
@@ -191,7 +189,6 @@ async def _(
 
         for event, handler in event_handlers.items():
             sio.on(event, handler=handler)
-        connected_sockets.append(sio)
         return sio, event_handlers
 
     return _
@@ -1091,7 +1088,7 @@ async def test_get_active_project(
     user_project: ProjectDict,
     client_session_id_factory: Callable[[], str],
     expected: int,
-    socketio_client_factory: Callable,
+    create_socketio_connection: Callable,
     mocked_dynamic_services_interface: dict[str, mock.Mock],
     mock_catalog_api: dict[str, mock.Mock],
     mocked_notifications_plugin: dict[str, mock.Mock],
@@ -1100,7 +1097,7 @@ async def test_get_active_project(
     client_id1 = client_session_id_factory()
     sio = None
     try:
-        sio = await socketio_client_factory(client_id1)
+        sio = await create_socketio_connection(client_id1)
         assert sio.sid
     except SocketConnectionError:
         if expected == status.HTTP_200_OK:
@@ -1146,7 +1143,7 @@ async def test_get_active_project(
     # login with socket using client session id2
     client_id2 = client_session_id_factory()
     try:
-        sio = await socketio_client_factory(client_id2)
+        sio = await create_socketio_connection(client_id2)
         assert sio.sid
     except SocketConnectionError:
         if expected == status.HTTP_200_OK: