fixed failing tests

Author: Andrei Neagu

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

@@ -172,9 +172,6 @@ async def director_v2_service_mock(
         r"^http://[a-z\-_]*director-v2:[0-9]+/v2/computations/.*:stop$"
     )
     delete_computation_pattern = get_computation_pattern
-    projects_networks_pattern = re.compile(
-        r"^http://[a-z\-_]*director-v2:[0-9]+/v2/dynamic_services/projects/.*/-/networks$"
-    )
 
     get_services_pattern = re.compile(
         r"^http://[a-z\-_]*director-v2:[0-9]+/v2/dynamic_services.*$"
@@ -202,7 +199,6 @@ async def director_v2_service_mock(
         repeat=True,
     )
     aioresponses_mocker.delete(delete_computation_pattern, status=204, repeat=True)
-    aioresponses_mocker.patch(projects_networks_pattern, status=204, repeat=True)
 
     return aioresponses_mocker
 

services/web/server/src/simcore_service_webserver/studies_dispatcher/_redirects_handlers.py

@@ -18,7 +18,7 @@
 from servicelib.aiohttp.typing_extension import Handler
 from servicelib.logging_errors import create_troubleshotting_log_kwargs
 
-from ..dynamic_scheduler.api import update_projects_networks
+from ..dynamic_scheduler import api as dynamic_scheduler_api
 from ..products.api import get_product_name
 from ..utils import compose_support_error_msg
 from ..utils_aiohttp import create_redirect_to_page_response
@@ -252,7 +252,9 @@ async def get_redirection_to_viewer(request: web.Request):
             file_params.download_link,
             product_name=get_product_name(request),
         )
-        await update_projects_networks(request.app, project_id=project_id)
+        await dynamic_scheduler_api.update_projects_networks(
+            request.app, project_id=project_id
+        )
 
         response = _create_redirect_response_to_view_page(
             request.app,
@@ -281,7 +283,9 @@ async def get_redirection_to_viewer(request: web.Request):
             service_info=_create_service_info_from(valid_service),
             product_name=get_product_name(request),
         )
-        await update_projects_networks(request.app, project_id=project_id)
+        await dynamic_scheduler_api.update_projects_networks(
+            request.app, project_id=project_id
+        )
 
         response = _create_redirect_response_to_view_page(
             request.app,
@@ -317,7 +321,9 @@ async def get_redirection_to_viewer(request: web.Request):
             ).STUDIES_DEFAULT_FILE_THUMBNAIL,
             product_name=get_product_name(request),
         )
-        await update_projects_networks(request.app, project_id=project_id)
+        await dynamic_scheduler_api.update_projects_networks(
+            request.app, project_id=project_id
+        )
 
         response = _create_redirect_response_to_view_page(
             request.app,

services/web/server/src/simcore_service_webserver/studies_dispatcher/_studies_access.py

@@ -28,7 +28,7 @@
 
 from .._constants import INDEX_RESOURCE_NAME
 from ..director_v2._core_computations import create_or_update_pipeline
-from ..dynamic_scheduler.api import update_projects_networks
+from ..dynamic_scheduler import api as dynamic_scheduler_api
 from ..products.api import get_current_product, get_product_name
 from ..projects._groups_db import get_project_group
 from ..projects.api import check_user_project_permission
@@ -212,7 +212,7 @@ async def copy_study_to_account(
         await create_or_update_pipeline(
             request.app, user["id"], project["uuid"], product_name
         )
-        await update_projects_networks(
+        await dynamic_scheduler_api.update_projects_networks(
             request.app, project_id=ProjectID(project["uuid"])
         )
 

services/web/server/tests/conftest.py

@@ -21,6 +21,7 @@
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.projects_state import ProjectState
+from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.dict_tools import ConfigDict
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
@@ -444,3 +445,15 @@ async def _creator(
     for client, project_uuid in zip(used_clients, created_project_uuids, strict=True):
         url = client.app.router["delete_project"].url_for(project_id=project_uuid)
         await client.delete(url.path)
+
+
+@pytest.fixture
+def mock_dynamic_scheduler(mocker: MockerFixture) -> None:
+    mocker.patch(
+        "simcore_service_webserver.dynamic_scheduler.api.stop_dynamic_services_in_project",
+        autospec=True,
+    )
+    mocker.patch(
+        "simcore_service_webserver.dynamic_scheduler.api.update_projects_networks",
+        autospec=True,
+    )

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

@@ -113,9 +113,6 @@ async def director_v2_service_mock(
         r"^http://[a-z\-_]*director-v2:[0-9]+/v2/computations/.*$"
     )
     delete_computation_pattern = get_computation_pattern
-    projects_networks_pattern = re.compile(
-        r"^http://[a-z\-_]*director-v2:[0-9]+/v2/dynamic_services/projects/.*/-/networks$"
-    )
 
     mocker.patch(
         "simcore_service_webserver.dynamic_scheduler.api.list_dynamic_services",
@@ -134,7 +131,6 @@ async def director_v2_service_mock(
             repeat=True,
         )
         mock.delete(delete_computation_pattern, status=204, repeat=True)
-        mock.patch(projects_networks_pattern, status=204, repeat=True)
         yield mock
 
 

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

@@ -239,10 +239,10 @@ async def project_db_cleaner(client: TestClient):
 
 
 @pytest.fixture(autouse=True)
-async def mocked_director_v2(
-    director_v2_service_mock: aioresponses,
-) -> AsyncIterator[aioresponses]:
-    return director_v2_service_mock
+async def mocked_director_v2_and_dynamic_scheduler_interfaces(
+    mock_dynamic_scheduler: None, director_v2_service_mock: aioresponses
+) -> None:
+    pass
 
 
 @pytest.fixture()

services/web/server/tests/unit/with_dbs/03/meta_modeling/test_meta_modeling_iterations.py

@@ -77,6 +77,7 @@ async def test_iterators_workflow(
     context_with_logged_user: None,
     mocker: MockerFixture,
     faker: Faker,
+    mock_dynamic_scheduler: None,
     director_v2_service_mock: None,
     request_create_project: Callable[..., Awaitable[ProjectDict]],
 ):

services/web/server/tests/unit/with_dbs/03/version_control/test_version_control_core.py

@@ -37,6 +37,7 @@ async def test_workflow(
     user_project: ProjectDict,
     aiohttp_mocked_request: web.Request,
     request_update_project: Callable[[TestClient, UUID], Awaitable],
+    mock_dynamic_scheduler: None,
     director_v2_service_mock: None,
 ):
     vc_repo = VersionControlRepository.create_from_request(aiohttp_mocked_request)

services/web/server/tests/unit/with_dbs/03/version_control/test_version_control_handlers.py

@@ -50,6 +50,7 @@ async def test_workflow(
     client: TestClient,
     user_project: ProjectDict,
     request_update_project: Callable[[TestClient, UUID], Awaitable],
+    mock_dynamic_scheduler: None,
     director_v2_service_mock: None,
 ):
     # pylint: disable=too-many-statements

services/web/server/tests/unit/with_dbs/04/studies_dispatcher/conftest.py

@@ -7,7 +7,6 @@
 import logging
 
 import pytest
-from pytest_mock import MockerFixture
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_service_webserver.log import setup_logging
@@ -64,11 +63,3 @@ def app_environment(app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatc
     print(plugin_settings.model_dump_json(indent=1))
 
     return {**app_environment, **envs_plugins, **envs_studies_dispatcher}
-
-
-@pytest.fixture
-def mock_dynamic_scheduler(mocker: MockerFixture) -> None:
-    mocker.patch(
-        "simcore_service_webserver.dynamic_scheduler.api.stop_dynamic_services_in_project",
-        autospec=True,
-    )