Skip to content

Commit ee96fc3

Browse files
committed
fixes mocks
1 parent 5c3b7e1 commit ee96fc3

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ def mock_get_total_project_dynamic_nodes_creation_interval(
374374
) -> None:
375375
_VERY_LONG_LOCK_TIMEOUT_S: Final[float] = 300
376376
mocker.patch(
377-
"simcore_service_webserver.projects._projects_service._nodes_api"
377+
"simcore_service_webserver.projects._projects_service._nodes_service"
378378
".get_total_project_dynamic_nodes_creation_interval",
379379
return_value=_VERY_LONG_LOCK_TIMEOUT_S,
380380
)

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def fake_project(
5959
@pytest.fixture
6060
def mock_catalog_api_get_service_access_rights_response(mocker: MockerFixture):
6161
mocker.patch(
62-
"simcore_service_webserver.projects._nodes_handlers.catalog_service.get_service_access_rights",
62+
"simcore_service_webserver.projects._controller.nodes_rest.catalog_service.get_service_access_rights",
6363
spec=True,
6464
side_effect=[
6565
ServiceAccessRightsGet(
@@ -130,7 +130,7 @@ async def test_accessible_thanks_to_everyone_group_id(
130130
logged_user: UserInfoDict,
131131
):
132132
mocker.patch(
133-
"simcore_service_webserver.projects._nodes_handlers.catalog_service.get_service_access_rights",
133+
"simcore_service_webserver.projects._controller.nodes_rest.catalog_service.get_service_access_rights",
134134
spec=True,
135135
side_effect=[
136136
ServiceAccessRightsGet(
@@ -185,7 +185,7 @@ async def test_accessible_thanks_to_concrete_group_id(
185185
for_gid = logged_user["primary_gid"]
186186

187187
mocker.patch(
188-
"simcore_service_webserver.projects._nodes_handlers.catalog_service.get_service_access_rights",
188+
"simcore_service_webserver.projects._controller.nodes_rest.catalog_service.get_service_access_rights",
189189
spec=True,
190190
side_effect=[
191191
ServiceAccessRightsGet(
@@ -238,7 +238,7 @@ async def test_accessible_through_product_group(
238238
for_gid = logged_user["primary_gid"]
239239

240240
mocker.patch(
241-
"simcore_service_webserver.projects._nodes_handlers.catalog_service.get_service_access_rights",
241+
"simcore_service_webserver.projects._controller.nodes_rest.catalog_service.get_service_access_rights",
242242
spec=True,
243243
side_effect=[
244244
ServiceAccessRightsGet(
@@ -297,7 +297,7 @@ async def test_accessible_for_one_service(
297297
for_gid = logged_user["primary_gid"]
298298

299299
mocker.patch(
300-
"simcore_service_webserver.projects._nodes_handlers.catalog_service.get_service_access_rights",
300+
"simcore_service_webserver.projects._controller.nodes_rest.catalog_service.get_service_access_rights",
301301
spec=True,
302302
side_effect=[
303303
ServiceAccessRightsGet(
@@ -355,7 +355,7 @@ async def test_not_accessible_for_more_services(
355355
logged_user: UserInfoDict,
356356
):
357357
mocker.patch(
358-
"simcore_service_webserver.projects._nodes_handlers.catalog_service.get_service_access_rights",
358+
"simcore_service_webserver.projects._controller.nodes_rest.catalog_service.get_service_access_rights",
359359
spec=True,
360360
side_effect=[
361361
ServiceAccessRightsGet(
@@ -421,7 +421,7 @@ async def test_not_accessible_for_service_because_of_execute_access_false(
421421
for_gid = logged_user["primary_gid"]
422422

423423
mocker.patch(
424-
"simcore_service_webserver.projects._nodes_handlers.catalog_service.get_service_access_rights",
424+
"simcore_service_webserver.projects._controller.nodes_rest.catalog_service.get_service_access_rights",
425425
spec=True,
426426
side_effect=[
427427
ServiceAccessRightsGet(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ async def test_open_project__in_debt(
453453
added_wallet, _ = await assert_status(resp, status.HTTP_201_CREATED)
454454

455455
mock_get_project_wallet_total_credits = mocker.patch(
456-
"simcore_service_webserver.projects._wallets_api.credit_transactions.get_project_wallet_total_credits",
456+
"simcore_service_webserver.projects._wallets_service.credit_transactions.get_project_wallet_total_credits",
457457
spec=True,
458458
return_value=WalletTotalCredits(
459459
wallet_id=added_wallet["walletId"],
@@ -1073,7 +1073,7 @@ async def test_project_node_lifetime( # noqa: PLR0915
10731073
create_dynamic_service_mock: Callable[..., Awaitable[DynamicServiceGet]],
10741074
):
10751075
mock_storage_api_delete_data_folders_of_project_node = mocker.patch(
1076-
"simcore_service_webserver.projects._controllers.projects_rest.projects_service.storage_api.delete_data_folders_of_project_node",
1076+
"simcore_service_webserver.projects._projects_service.storage_service.delete_data_folders_of_project_node",
10771077
return_value="",
10781078
)
10791079
assert client.app

services/web/server/tests/unit/with_dbs/03/trash/test_trash.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ async def test_trash_projects( # noqa: PLR0915
6161
autospec=True,
6262
)
6363
mocker.patch(
64-
"simcore_service_webserver.projects._trash_service.director_v2_api.is_pipeline_running",
64+
"simcore_service_webserver.projects._trash_service.director_v2_service.is_pipeline_running",
6565
return_value=is_project_running,
6666
autospec=True,
6767
)
6868
mocker.patch(
69-
"simcore_service_webserver.projects._trash_service.dynamic_scheduler_api.list_dynamic_services",
69+
"simcore_service_webserver.projects._trash_service.dynamic_scheduler_service.list_dynamic_services",
7070
return_value=[mocker.MagicMock()] if is_project_running else [],
7171
autospec=True,
7272
)

services/web/server/tests/unit/with_dbs/04/folders/test_folders.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ def mock_storage_delete_data_folders(mocker: MockerFixture) -> mock.Mock:
391391
autospec=True,
392392
)
393393
mocker.patch(
394-
"simcore_service_webserver.projects._crud_api_delete.api.delete_pipeline",
394+
"simcore_service_webserver.projects._crud_api_delete.director_v2_service.delete_pipeline",
395395
autospec=True,
396396
)
397397
return mocker.patch(

services/web/server/tests/unit/with_dbs/04/workspaces/test_workspaces__folders_and_projects_crud.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def mock_storage_delete_data_folders(mocker: MockerFixture) -> mock.Mock:
258258
autospec=True,
259259
)
260260
mocker.patch(
261-
"simcore_service_webserver.projects._crud_api_delete.api.delete_pipeline",
261+
"simcore_service_webserver.projects._crud_api_delete.director_v2_service.delete_pipeline",
262262
autospec=True,
263263
)
264264
return mocker.patch(

0 commit comments

Comments
 (0)