fixed tests

Author: Andrei Neagu

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

@@ -414,7 +414,7 @@ def inc_running_services(self, *args, **kwargs):  # noqa: ARG002
     running_services = _RunningServices()
     assert running_services.running_services_uuids == []
     mocked_director_v2_api[
-        "director_v2.api.list_dynamic_services"
+        "dynamic_scheduler.api.list_dynamic_services"
     ].side_effect = running_services.num_services
     mocked_director_v2_api[
         "dynamic_scheduler.api.run_dynamic_service"
@@ -481,7 +481,9 @@ async def test_create_node_does_not_start_dynamic_node_if_there_are_already_too_
         max_amount_of_auto_started_dyn_services
     )
     all_service_uuids = list(project["workbench"])
-    mocked_director_v2_api["director_v2.api.list_dynamic_services"].return_value = [
+    mocked_director_v2_api[
+        "dynamic_scheduler.api.list_dynamic_services"
+    ].return_value = [
         {"service_uuid": service_uuid} for service_uuid in all_service_uuids
     ]
     url = client.app.router["create_node"].url_for(project_id=project["uuid"])
@@ -539,7 +541,7 @@ async def inc_running_services(self, *args, **kwargs):  # noqa: ARG002
     running_services = _RunninServices()
     assert running_services.running_services_uuids == []
     mocked_director_v2_api[
-        "director_v2.api.list_dynamic_services"
+        "dynamic_scheduler.api.list_dynamic_services"
     ].side_effect = running_services.num_services
     mocked_director_v2_api[
         "dynamic_scheduler.api.run_dynamic_service"
@@ -593,7 +595,9 @@ async def test_create_node_does_start_dynamic_node_if_max_num_set_to_0(
     assert client.app
     project = await user_project_with_num_dynamic_services(faker.pyint(min_value=3))
     all_service_uuids = list(project["workbench"])
-    mocked_director_v2_api["director_v2.api.list_dynamic_services"].return_value = [
+    mocked_director_v2_api[
+        "dynamic_scheduler.api.list_dynamic_services"
+    ].return_value = [
         {"service_uuid": service_uuid} for service_uuid in all_service_uuids
     ]
     url = client.app.router["create_node"].url_for(project_id=project["uuid"])
@@ -682,7 +686,7 @@ async def test_delete_node(
         )
         for service_uuid in running_dy_services
     ]
-    # mocked_director_v2_api["director_v2.api.list_dynamic_services"].return_value = [
+    # mocked_director_v2_api["dynamic_scheduler.api.list_dynamic_services"].return_value = [
     #     {"service_uuid": service_uuid} for service_uuid in running_dy_services
     # ]
     for node_id in user_project["workbench"]:
@@ -696,9 +700,11 @@ async def test_delete_node(
             continue
 
         mocked_director_v2_api[
-            "director_v2.api.list_dynamic_services"
+            "dynamic_scheduler.api.list_dynamic_services"
         ].assert_called_once()
-        mocked_director_v2_api["director_v2.api.list_dynamic_services"].reset_mock()
+        mocked_director_v2_api[
+            "dynamic_scheduler.api.list_dynamic_services"
+        ].reset_mock()
 
         if node_id in running_dy_services:
             mocked_director_v2_api[
@@ -788,7 +794,9 @@ async def test_start_node_raises_if_dynamic_services_limit_attained(
         max_amount_of_auto_started_dyn_services
     )
     all_service_uuids = list(project["workbench"])
-    mocked_director_v2_api["director_v2.api.list_dynamic_services"].return_value = [
+    mocked_director_v2_api[
+        "dynamic_scheduler.api.list_dynamic_services"
+    ].return_value = [
         {"service_uuid": service_uuid} for service_uuid in all_service_uuids
     ]
     # start the node, shall work as expected
@@ -821,7 +829,9 @@ async def test_start_node_starts_dynamic_service_if_max_number_of_services_set_t
     assert client.app
     project = await user_project_with_num_dynamic_services(faker.pyint(min_value=3))
     all_service_uuids = list(project["workbench"])
-    mocked_director_v2_api["director_v2.api.list_dynamic_services"].return_value = [
+    mocked_director_v2_api[
+        "dynamic_scheduler.api.list_dynamic_services"
+    ].return_value = [
         {"service_uuid": service_uuid} for service_uuid in all_service_uuids
     ]
     # start the node, shall work as expected

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

@@ -587,7 +587,9 @@ async def test_open_project_with_disable_service_auto_start_set_overrides_behavi
     project = await user_project_with_num_dynamic_services(num_of_dyn_services)
     all_service_uuids = list(project["workbench"])
     for num_service_already_running in range(num_of_dyn_services):
-        mocked_director_v2_api["director_v2.api.list_dynamic_services"].return_value = [
+        mocked_director_v2_api[
+            "dynamic_scheduler.api.list_dynamic_services"
+        ].return_value = [
             {"service_uuid": all_service_uuids[service_id]}
             for service_id in range(num_service_already_running)
         ]
@@ -817,10 +819,12 @@ async def test_close_project(
         mocked_notifications_plugin["subscribe"].assert_called_once_with(
             client.app, ProjectID(user_project["uuid"])
         )
-        mocked_director_v2_api["director_v2.api.list_dynamic_services"].assert_any_call(
-            client.app, user_id, user_project["uuid"]
-        )
-        mocked_director_v2_api["director_v2.api.list_dynamic_services"].reset_mock()
+        mocked_director_v2_api[
+            "dynamic_scheduler.api.list_dynamic_services"
+        ].assert_any_call(client.app, user_id, user_project["uuid"])
+        mocked_director_v2_api[
+            "dynamic_scheduler.api.list_dynamic_services"
+        ].reset_mock()
     else:
         mocked_notifications_plugin["subscribe"].assert_not_called()
 

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

@@ -186,7 +186,7 @@ def request_update_project(
         return_value=ServiceResourcesDict(),
     )
     mocker.patch(
-        "simcore_service_webserver.director_v2.api.list_dynamic_services",
+        "simcore_service_webserver.dynamic_scheduler.api.list_dynamic_services",
         return_value=[],
     )