restore fixtures

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

@@ -17,10 +17,7 @@
 from aiohttp.test_utils import TestClient
 from aioresponses import aioresponses
 from faker import Faker
-from models_library.api_schemas_directorv2.dynamic_services import (
-    DynamicServiceGet,
-    GetProjectInactivityResponse,
-)
+from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
 from models_library.projects_nodes import Node, NodeID
 from models_library.projects_state import ProjectState
 from models_library.services_resources import (
@@ -267,19 +264,9 @@ async def _assert_it(
     return _assert_it
 
 
-@pytest.fixture
-def disable_dynamic_scheduler_inactivity(mocker: MockerFixture) -> None:
-    mocker.patch(
-        "simcore_service_webserver.projects.projects_api.dynamic_scheduler_api.get_project_inactivity",
-        return_value=GetProjectInactivityResponse(is_inactive=True),
-    )
-
-
 @pytest.fixture
 def app_environment(
-    app_environment: EnvVarsDict,
-    monkeypatch: pytest.MonkeyPatch,
-    disable_dynamic_scheduler_inactivity: None,
+    app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch
 ) -> EnvVarsDict:
     envs_plugins = setenvs_from_dict(
         monkeypatch,

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

@@ -4,6 +4,7 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
+import re
 import uuid as uuidlib
 from collections.abc import Awaitable, Callable, Iterator
 from http import HTTPStatus
@@ -654,19 +655,38 @@ async def test_new_template_from_project(
             TypeAdapter(uuidlib.UUID).validate_python(node_name)
 
 
+@pytest.fixture
+def mock_director_v2_inactivity(
+    aioresponses_mocker: aioresponses, is_inactive: bool
+) -> None:
+    aioresponses_mocker.clear()
+    get_services_pattern = re.compile(
+        r"^http://[a-z\-_]*director-v2:[0-9]+/v2/dynamic_services/projects/.*/inactivity.*$"
+    )
+    aioresponses_mocker.get(
+        get_services_pattern,
+        status=status.HTTP_200_OK,
+        repeat=True,
+        payload={"is_inactive": is_inactive},
+    )
+
+
 @pytest.mark.parametrize(
     "user_role,expected",
     [
         (UserRole.ANONYMOUS, status.HTTP_401_UNAUTHORIZED),
         *((role, status.HTTP_200_OK) for role in UserRole if role > UserRole.ANONYMOUS),
     ],
 )
+@pytest.mark.parametrize("is_inactive", [True, False])
 async def test_get_project_inactivity(
+    mock_director_v2_inactivity: None,
     logged_user: UserInfoDict,
     client: TestClient,
     faker: Faker,
     user_role: UserRole,
     expected: HTTPStatus,
+    is_inactive: bool,
 ):
     mock_project_id = faker.uuid4()
 
@@ -682,4 +702,4 @@ async def test_get_project_inactivity(
 
     assert data
     assert error is None
-    assert data["is_inactive"] is True
+    assert data["is_inactive"] is is_inactive