separating tests

Author: sanderegg

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

@@ -508,3 +508,19 @@ def with_enabled_rtc_collaboration(
             )
         },
     )
+
+
+@pytest.fixture
+def with_enabled_rtc_collaboration_limited_to_1_user(
+    app_environment: EnvVarsDict,
+    with_dev_features_enabled: None,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    setenvs_from_dict(
+        monkeypatch,
+        {
+            "WEBSERVER_REALTIME_COLLABORATION": json_dumps(
+                {"RTC_MAX_NUMBER_OF_USERS": 1}
+            )
+        },
+    )

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

@@ -8,7 +8,6 @@
 import asyncio
 import contextlib
 import logging
-import secrets
 from collections.abc import AsyncIterator, Awaitable, Callable, Iterator
 from copy import deepcopy
 from datetime import UTC, datetime, timedelta
@@ -1423,6 +1422,7 @@ def clean_redis_table(redis_client) -> None:
     """this just ensures the redis table is cleaned up between test runs"""
 
 
+@pytest.mark.acceptance_test
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_open_shared_project_multiple_users(
     max_number_of_user_sessions: int,
@@ -1559,33 +1559,6 @@ async def test_open_shared_project_multiple_users(
         sio_n_handlers[SOCKET_IO_PROJECT_UPDATED_EVENT], shared_project, []
     )
 
-    #
-    # TEST refreshing tab of some user shall work
-    #
-    refreshing_user_index = secrets.randbelow(len(other_users))
-    user_x, client_x, _, closed_sio_x, _ = other_users.pop(refreshing_user_index)
-    # close tab of user x
-    await closed_sio_x.disconnect()
-    await asyncio.sleep(5)  # wait for the disconnect to be processed
-    (
-        new_sio_x,
-        new_client_x_tab_id,
-        new_sio_x_handlers,
-    ) = await create_socketio_connection_with_handlers(client_x)
-    await _assert_project_state_updated(
-        new_sio_x_handlers[SOCKET_IO_PROJECT_UPDATED_EVENT],
-        shared_project,
-        [],
-    )
-
-    await _open_project(client_x, new_client_x_tab_id, shared_project, expected.ok)
-
-    await _assert_project_state_updated(
-        new_sio_x_handlers[SOCKET_IO_PROJECT_UPDATED_EVENT],
-        shared_project,
-        [opened_project_state],
-    )
-
     # this triggers the new opening of the same users
     for _user_j, client_j, _, _sio_j, sio_j_handlers in other_users:
         # check already opened  by other users which should also notify
@@ -1597,10 +1570,7 @@ async def test_open_shared_project_multiple_users(
         await _state_project(
             client_j, shared_project, expected.ok, opened_project_state
         )
-    # put back the refreshed user in the list of other users
-    other_users.append(
-        (user_x, client_x, new_client_x_tab_id, new_sio_x, new_sio_x_handlers)
-    )
+
     await _assert_project_state_updated(
         sio_base_handlers[SOCKET_IO_PROJECT_UPDATED_EVENT],
         shared_project,
@@ -1643,6 +1613,94 @@ async def test_open_shared_project_multiple_users(
         )
 
 
+@pytest.mark.parametrize(*standard_user_role_response())
+async def test_refreshing_tab_of_opened_project_multiple_users(
+    with_enabled_rtc_collaboration_limited_to_1_user: None,
+    client: TestClient,
+    client_on_running_server_factory: Callable[[], TestClient],
+    logged_user: dict,
+    shared_project: dict,
+    expected: ExpectedResponse,
+    exit_stack: contextlib.AsyncExitStack,
+    create_socketio_connection_with_handlers: Callable[
+        [TestClient], Awaitable[tuple[socketio.AsyncClient, str, _SocketHandlers]]
+    ],
+    mocked_dynamic_services_interface: dict[str, mock.Mock],
+    mock_catalog_api: dict[str, mock.Mock],
+):
+    # This test is a simplified version of the test_open_shared_project_multiple_users
+    # It only tests refreshing the tab of an already opened project
+    base_client = client
+    (
+        sio_base,
+        base_client_tab_id,
+        sio_base_handlers,
+    ) = await create_socketio_connection_with_handlers(base_client)
+
+    # current state is closed and unlocked
+    closed_project_state = ProjectStateOutputSchema(
+        share_state=ProjectShareStateOutputSchema(
+            locked=False, status=ProjectStatus.CLOSED, current_user_groupids=[]
+        ),
+        state=ProjectRunningState(value=RunningState.NOT_STARTED),
+    )
+    await _state_project(
+        base_client, shared_project, HTTPStatus.OK, closed_project_state
+    )
+
+    # now user  opens the shared project
+    await _open_project(base_client, base_client_tab_id, shared_project, expected.ok)
+    opened_project_state = closed_project_state.model_copy(
+        update={
+            "share_state": ProjectShareStateOutputSchema(
+                locked=True,
+                status=ProjectStatus.OPENED,
+                current_user_groupids=[logged_user["primary_gid"]],
+            ),
+        }
+    )
+    await _assert_project_state_updated(
+        sio_base_handlers[SOCKET_IO_PROJECT_UPDATED_EVENT],
+        shared_project,
+        [opened_project_state] * 2,
+    )
+    await _state_project(
+        base_client, shared_project, HTTPStatus.OK, opened_project_state
+    )
+
+    #
+    # TEST refreshing tab of some user shall work
+    #
+    # refreshing_user_index = secrets.randbelow(len(other_users))
+    # user_x, client_x, _, closed_sio_x, _ = other_users.pop(refreshing_user_index)
+    # # close tab of user x
+    # await closed_sio_x.disconnect()
+    # await asyncio.sleep(5)  # wait for the disconnect to be processed
+    # (
+    #     new_sio_x,
+    #     new_client_x_tab_id,
+    #     new_sio_x_handlers,
+    # ) = await create_socketio_connection_with_handlers(client_x)
+    # await _assert_project_state_updated(
+    #     new_sio_x_handlers[SOCKET_IO_PROJECT_UPDATED_EVENT],
+    #     shared_project,
+    #     [],
+    # )
+
+    # await _open_project(client_x, new_client_x_tab_id, shared_project, expected.ok)
+
+    # await _assert_project_state_updated(
+    #     new_sio_x_handlers[SOCKET_IO_PROJECT_UPDATED_EVENT],
+    #     shared_project,
+    #     [opened_project_state],
+    # )
+
+    # # put back the refreshed user in the list of other users
+    # other_users.append(
+    #     (user_x, client_x, new_client_x_tab_id, new_sio_x, new_sio_x_handlers)
+    # )
+
+
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_open_shared_project_2_users_locked_remove_once_rtc_collaboration_is_defaulted(
     client: TestClient,