fix test

Author: matusdrobuliak66

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

@@ -16,6 +16,7 @@
 import pytest
 from aiohttp.test_utils import TestClient
 from aioresponses import aioresponses
+from common_library.json_serialization import json_dumps
 from faker import Faker
 from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
 from models_library.projects_nodes import Node, NodeID
@@ -27,6 +28,8 @@
 from pydantic import TypeAdapter
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
+from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
+from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.webserver_projects import NewProject, delete_all_projects
 from pytest_simcore.helpers.webserver_users import UserInfoDict
 from settings_library.catalog import CatalogSettings
@@ -483,3 +486,25 @@ def workbench_db_column() -> dict[str, Any]:
 def workbench(workbench_db_column: dict[str, Any]) -> dict[NodeID, Node]:
     # convert to  model
     return TypeAdapter(dict[NodeID, Node]).validate_python(workbench_db_column)
+
+
+@pytest.fixture
+def max_number_of_user_sessions(faker: Faker) -> int:
+    return faker.pyint(min_value=1, max_value=5)
+
+
+@pytest.fixture
+def with_enabled_rtc_collaboration(
+    app_environment: EnvVarsDict,
+    with_dev_features_enabled: None,
+    monkeypatch: pytest.MonkeyPatch,
+    max_number_of_user_sessions: int,
+) -> None:
+    setenvs_from_dict(
+        monkeypatch,
+        {
+            "WEBSERVER_REALTIME_COLLABORATION": json_dumps(
+                {"RTC_MAX_NUMBER_OF_USERS": max_number_of_user_sessions}
+            )
+        },
+    )

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

@@ -49,6 +49,7 @@ def user_primary_gid(logged_user: UserInfoDict) -> int:
 )
 async def test_patch_project_and_notify_users_sequential(
     user_role: UserRole,
+    with_enabled_rtc_collaboration: None,
     expected: HTTPStatus,
     client: TestClient,
     user_project: ProjectDict,
@@ -105,6 +106,7 @@ async def test_patch_project_and_notify_users_sequential(
 )
 async def test_patch_project_and_notify_users_concurrent_locking(
     user_role: UserRole,
+    with_enabled_rtc_collaboration: None,
     expected: HTTPStatus,
     client: TestClient,
     user_project: ProjectDict,
@@ -155,6 +157,7 @@ async def test_patch_project_and_notify_users_concurrent_locking(
 )
 async def test_patch_project_and_notify_users_concurrent_different_projects(
     user_role: UserRole,
+    with_enabled_rtc_collaboration: None,
     expected: HTTPStatus,
     client: TestClient,
     user_project: ProjectDict,

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

@@ -22,7 +22,6 @@
 import sqlalchemy as sa
 from aiohttp import ClientResponse
 from aiohttp.test_utils import TestClient, TestServer
-from common_library.json_serialization import json_dumps
 from faker import Faker
 from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
 from models_library.api_schemas_dynamic_scheduler.dynamic_services import (
@@ -54,8 +53,6 @@
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.logging_tools import log_context
-from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
-from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.webserver_login import LoggedUser, log_client_in
 from pytest_simcore.helpers.webserver_parametrizations import (
     ExpectedResponse,
@@ -88,26 +85,26 @@
 API_PREFIX = f"/{API_VTAG}"
 
 
-@pytest.fixture
-def max_number_of_user_sessions(faker: Faker) -> int:
-    return faker.pyint(min_value=1, max_value=5)
-
-
-@pytest.fixture
-def with_enabled_rtc_collaboration(
-    app_environment: EnvVarsDict,
-    with_dev_features_enabled: None,
-    monkeypatch: pytest.MonkeyPatch,
-    max_number_of_user_sessions: int,
-) -> None:
-    setenvs_from_dict(
-        monkeypatch,
-        {
-            "WEBSERVER_REALTIME_COLLABORATION": json_dumps(
-                {"RTC_MAX_NUMBER_OF_USERS": max_number_of_user_sessions}
-            )
-        },
-    )
+# @pytest.fixture
+# def max_number_of_user_sessions(faker: Faker) -> int:
+#     return faker.pyint(min_value=1, max_value=5)
+
+
+# @pytest.fixture
+# def with_enabled_rtc_collaboration(
+#     app_environment: EnvVarsDict,
+#     with_dev_features_enabled: None,
+#     monkeypatch: pytest.MonkeyPatch,
+#     max_number_of_user_sessions: int,
+# ) -> None:
+#     setenvs_from_dict(
+#         monkeypatch,
+#         {
+#             "WEBSERVER_REALTIME_COLLABORATION": json_dumps(
+#                 {"RTC_MAX_NUMBER_OF_USERS": max_number_of_user_sessions}
+#             )
+#         },
+#     )
 
 
 def assert_replaced(current_project, update_data):