Skip to content

Commit 5e5f47e

Browse files
pcrespovpcrespov
committed
fixes mocks
1 parent fc4c6b5 commit 5e5f47e

16 files changed

+28
-28
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ def mock_catalog_api(
9292
) -> dict[str, mock.Mock]:
9393
return {
9494
"get_service_resources": mocker.patch(
95-
"simcore_service_webserver.projects.projects_service.catalog_service.get_service_resources",
95+
"simcore_service_webserver.projects._projects_service.catalog_service.get_service_resources",
9696
return_value=mock_service_resources,
9797
autospec=True,
9898
),
9999
"get_service": mocker.patch(
100-
"simcore_service_webserver.projects.projects_service.catalog_service.get_service",
100+
"simcore_service_webserver.projects._projects_service.catalog_service.get_service",
101101
return_value=mock_service,
102102
autospec=True,
103103
),
@@ -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_api"
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_crud_handlers__patch.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
@pytest.fixture
2626
def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
2727
mocker.patch(
28-
"simcore_service_webserver.projects._crud_handlers.catalog_service.get_services_for_user_in_product",
28+
"simcore_service_webserver.projects._controllers.projects_rest.catalog_service.get_services_for_user_in_product",
2929
spec=True,
3030
return_value=[],
3131
)
@@ -34,7 +34,7 @@ def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
3434
@pytest.fixture
3535
def mock_project_uses_available_services(mocker: MockerFixture):
3636
mocker.patch(
37-
"simcore_service_webserver.projects._crud_handlers.project_uses_available_services",
37+
"simcore_service_webserver.projects._controllers.projects_rest.project_uses_available_services",
3838
spec=True,
3939
return_value=True,
4040
)

‎services/web/server/tests/unit/with_dbs/02/test_projects_groups_handlers.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
@pytest.fixture
2121
def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
2222
mocker.patch(
23-
"simcore_service_webserver.projects._crud_handlers.catalog_service.get_services_for_user_in_product",
23+
"simcore_service_webserver.projects._controllers.projects_rest.catalog_service.get_services_for_user_in_product",
2424
spec=True,
2525
return_value=[],
2626
)
@@ -29,7 +29,7 @@ def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
2929
@pytest.fixture
3030
def mock_project_uses_available_services(mocker: MockerFixture):
3131
mocker.patch(
32-
"simcore_service_webserver.projects._crud_handlers.project_uses_available_services",
32+
"simcore_service_webserver.projects._controllers.projects_rest.project_uses_available_services",
3333
spec=True,
3434
return_value=True,
3535
)

‎services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handlers__patch.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
@pytest.fixture
3030
def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
3131
mocker.patch(
32-
"simcore_service_webserver.projects._crud_handlers.catalog_service.get_services_for_user_in_product",
32+
"simcore_service_webserver.projects._controllers.projects_rest.catalog_service.get_services_for_user_in_product",
3333
spec=True,
3434
return_value=[],
3535
)
@@ -38,7 +38,7 @@ def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
3838
@pytest.fixture
3939
def mock_project_uses_available_services(mocker: MockerFixture):
4040
mocker.patch(
41-
"simcore_service_webserver.projects._crud_handlers.project_uses_available_services",
41+
"simcore_service_webserver.projects._controllers.projects_rest.project_uses_available_services",
4242
spec=True,
4343
return_value=True,
4444
)
@@ -47,7 +47,7 @@ def mock_project_uses_available_services(mocker: MockerFixture):
4747
@pytest.fixture
4848
def mock_catalog_rpc_check_for_service(mocker: MockerFixture):
4949
mocker.patch(
50-
"simcore_service_webserver.projects.projects_service.catalog_rpc.check_for_service",
50+
"simcore_service_webserver.projects._projects_service.catalog_rpc.check_for_service",
5151
spec=True,
5252
return_value=True,
5353
)
@@ -56,7 +56,7 @@ def mock_catalog_rpc_check_for_service(mocker: MockerFixture):
5656
@pytest.fixture
5757
def mocked_notify_project_node_update(mocker: MockerFixture):
5858
return mocker.patch(
59-
"simcore_service_webserver.projects.projects_service.notify_project_node_update",
59+
"simcore_service_webserver.projects._projects_service.notify_project_node_update",
6060
)
6161

6262

@@ -362,14 +362,14 @@ async def test_patch_project_node_service_key_with_error(
362362
_patch_version = {"version": "2.0.9"}
363363

364364
with mocker.patch(
365-
"simcore_service_webserver.projects.projects_service.catalog_rpc.check_for_service",
365+
"simcore_service_webserver.projects._projects_service.catalog_rpc.check_for_service",
366366
side_effect=CatalogForbiddenError(name="test"),
367367
):
368368
resp = await client.patch(f"{url}", json=_patch_version)
369369
assert resp.status == status.HTTP_403_FORBIDDEN
370370

371371
with mocker.patch(
372-
"simcore_service_webserver.projects.projects_service.catalog_rpc.check_for_service",
372+
"simcore_service_webserver.projects._projects_service.catalog_rpc.check_for_service",
373373
side_effect=CatalogItemNotFoundError(name="test"),
374374
):
375375
resp = await client.patch(f"{url}", json=_patch_version)

‎services/web/server/tests/unit/with_dbs/02/test_projects_nodes_pricing_unit_handlers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def _fake_instance_type_details(
136136
]
137137

138138
return mocker.patch(
139-
"simcore_service_webserver.projects.projects_service.get_instance_type_details",
139+
"simcore_service_webserver.projects._projects_service.get_instance_type_details",
140140
side_effect=_fake_instance_type_details,
141141
)
142142

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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._crud_handlers.projects_service.storage_api.delete_data_folders_of_project_node",
1076+
"simcore_service_webserver.projects._controllers.projects_rest.projects_service.storage_api.delete_data_folders_of_project_node",
10771077
return_value="",
10781078
)
10791079
assert client.app

‎services/web/server/tests/unit/with_dbs/02/test_projects_wallet_handlers.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def mock_get_project_wallet_total_credits(
111111
mocker: MockerFixture, setup_wallets_db: list[WalletGet]
112112
):
113113
mocker.patch(
114-
"simcore_service_webserver.projects._wallets_api.credit_transactions.get_project_wallet_total_credits",
114+
"simcore_service_webserver.projects._wallets_service.credit_transactions.get_project_wallet_total_credits",
115115
spec=True,
116116
return_value=WalletTotalCredits(
117117
wallet_id=setup_wallets_db[0].wallet_id, available_osparc_credits=Decimal(0)
@@ -122,7 +122,7 @@ def mock_get_project_wallet_total_credits(
122122
@pytest.fixture
123123
def mock_get_service_run_page(mocker: MockerFixture):
124124
mocker.patch(
125-
"simcore_service_webserver.projects._wallets_api.service_runs.get_service_run_page",
125+
"simcore_service_webserver.projects._wallets_service.service_runs.get_service_run_page",
126126
spec=True,
127127
return_value=ServiceRunPage(items=[], total=0),
128128
)
@@ -181,7 +181,7 @@ async def test_project_wallets_full_workflow(
181181
@pytest.fixture
182182
def mock_pay_project_debt(mocker: MockerFixture):
183183
return mocker.patch(
184-
"simcore_service_webserver.projects._wallets_api.credit_transactions.pay_project_debt",
184+
"simcore_service_webserver.projects._wallets_service.credit_transactions.pay_project_debt",
185185
spec=True,
186186
)
187187

‎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
@@ -387,7 +387,7 @@ def mock_storage_delete_data_folders(mocker: MockerFixture) -> mock.Mock:
387387
autospec=True,
388388
)
389389
mocker.patch(
390-
"simcore_service_webserver.projects.projects_service.remove_project_dynamic_services",
390+
"simcore_service_webserver.projects._projects_service.remove_project_dynamic_services",
391391
autospec=True,
392392
)
393393
mocker.patch(

‎services/web/server/tests/unit/with_dbs/04/garbage_collector/test_resource_manager.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ async def test_interactive_services_remain_after_websocket_reconnection_from_2_t
651651
async def mocked_notification_system(mocker):
652652
mocks = {}
653653
mocked_notification_system = mocker.patch(
654-
"simcore_service_webserver.projects.projects_service.retrieve_and_notify_project_locked_state",
654+
"simcore_service_webserver.projects._projects_service.retrieve_and_notify_project_locked_state",
655655
return_value=Future(),
656656
)
657657
mocked_notification_system.return_value.set_result("")

‎services/web/server/tests/unit/with_dbs/04/studies_dispatcher/test_studies_dispatcher_handlers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ def mocks_on_projects_api(mocker) -> None:
299299
All projects in this module are UNLOCKED
300300
"""
301301
mocker.patch(
302-
"simcore_service_webserver.projects.projects_service._get_project_lock_state",
302+
"simcore_service_webserver.projects._projects_service._get_project_lock_state",
303303
return_value=ProjectLocked(value=False, status=ProjectStatus.CLOSED),
304304
)
305305

0 commit comments

Comments
 (0)