Skip to content

Commit 73a5d34

Browse files
committed
fixed tests
1 parent 81ccf50 commit 73a5d34

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

services/director-v2/tests/integration/01/test_computation_api.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ def test_invalid_computation(
192192
async def test_start_empty_computation_is_refused(
193193
async_client: httpx.AsyncClient,
194194
create_registered_user: Callable,
195+
product_db: dict[str, Any],
195196
project: Callable[..., Awaitable[ProjectAtDB]],
196197
osparc_product_name: str,
197198
osparc_product_api_base_url: str,
@@ -397,6 +398,7 @@ async def test_run_partial_computation(
397398
wait_for_catalog_service: Callable[[UserID, str], Awaitable[None]],
398399
async_client: httpx.AsyncClient,
399400
create_registered_user: Callable,
401+
product_db: dict[str, Any],
400402
project: Callable[..., Awaitable[ProjectAtDB]],
401403
update_project_workbench_with_comp_tasks: Callable,
402404
fake_workbench_without_outputs: dict[str, Any],
@@ -549,6 +551,7 @@ async def test_run_computation(
549551
wait_for_catalog_service: Callable[[UserID, str], Awaitable[None]],
550552
async_client: httpx.AsyncClient,
551553
create_registered_user: Callable,
554+
product_db: dict[str, Any],
552555
project: Callable[..., Awaitable[ProjectAtDB]],
553556
fake_workbench_without_outputs: dict[str, Any],
554557
update_project_workbench_with_comp_tasks: Callable,
@@ -667,6 +670,7 @@ async def test_run_computation(
667670
async def test_abort_computation(
668671
async_client: httpx.AsyncClient,
669672
create_registered_user: Callable,
673+
product_db: dict[str, Any],
670674
project: Callable[..., Awaitable[ProjectAtDB]],
671675
fake_workbench_without_outputs: dict[str, Any],
672676
fake_workbench_computational_pipeline_details: PipelineDetails,
@@ -746,6 +750,7 @@ async def test_abort_computation(
746750
async def test_update_and_delete_computation(
747751
async_client: httpx.AsyncClient,
748752
create_registered_user: Callable,
753+
product_db: dict[str, Any],
749754
project: Callable[..., Awaitable[ProjectAtDB]],
750755
fake_workbench_without_outputs: dict[str, Any],
751756
fake_workbench_computational_pipeline_details_not_started: PipelineDetails,
@@ -874,6 +879,7 @@ async def test_update_and_delete_computation(
874879
async def test_pipeline_with_no_computational_services_still_create_correct_comp_tasks_in_db(
875880
async_client: httpx.AsyncClient,
876881
create_registered_user: Callable,
882+
product_db: dict[str, Any],
877883
project: Callable[..., Awaitable[ProjectAtDB]],
878884
jupyter_service: dict[str, Any],
879885
osparc_product_name: str,
@@ -920,6 +926,7 @@ async def test_pipeline_with_no_computational_services_still_create_correct_comp
920926
async def test_pipeline_with_control_loop_made_of_dynamic_services_is_allowed(
921927
client: TestClient,
922928
create_registered_user: Callable,
929+
product_db: dict[str, Any],
923930
project: Callable[..., Awaitable[ProjectAtDB]],
924931
jupyter_service: dict[str, Any],
925932
osparc_product_name: str,
@@ -991,6 +998,7 @@ async def test_pipeline_with_control_loop_made_of_dynamic_services_is_allowed(
991998
async def test_pipeline_with_cycle_containing_a_computational_service_is_forbidden(
992999
client: TestClient,
9931000
create_registered_user: Callable,
1001+
product_db: dict[str, Any],
9941002
project: Callable[..., Awaitable[ProjectAtDB]],
9951003
sleeper_service: dict[str, Any],
9961004
jupyter_service: dict[str, Any],
@@ -1075,6 +1083,7 @@ async def test_pipeline_with_cycle_containing_a_computational_service_is_forbidd
10751083
async def test_burst_create_computations(
10761084
async_client: httpx.AsyncClient,
10771085
create_registered_user: Callable,
1086+
product_db: dict[str, Any],
10781087
project: Callable[..., Awaitable[ProjectAtDB]],
10791088
fake_workbench_without_outputs: dict[str, Any],
10801089
update_project_workbench_with_comp_tasks: Callable,

services/director-v2/tests/integration/02/test_dynamic_services_routes.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ def user_id(user_db: dict[str, Any]) -> UserID:
9797

9898
@pytest.fixture
9999
async def project_id(
100-
user_db: dict[str, Any], project: Callable[..., Awaitable[ProjectAtDB]]
100+
user_db: dict[str, Any],
101+
project: Callable[..., Awaitable[ProjectAtDB]],
102+
product_db: dict[str, Any],
101103
) -> str:
102104
prj = await project(user=user_db)
103105
return f"{prj.uuid}"

services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -921,6 +921,7 @@ async def _assert_retrieve_completed(
921921
async def test_nodeports_integration(
922922
cleanup_services_and_networks: None,
923923
projects_networks_db: None,
924+
product_db: dict[str, Any],
924925
mocked_service_awaits_manual_interventions: None,
925926
mock_resource_usage_tracker: None,
926927
mock_osparc_variables_api_auth_rpc: None,

services/director-v2/tests/integration/02/test_mixed_dynamic_sidecar_and_legacy_project.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ def user_dict(create_registered_user: Callable) -> dict[str, Any]:
139139
async def dy_static_file_server_project(
140140
minimal_configuration: None,
141141
user_dict: dict[str, Any],
142+
product_db: dict[str, Any],
142143
project: Callable[..., Awaitable[ProjectAtDB]],
143144
dy_static_file_server_service: dict,
144145
dy_static_file_server_dynamic_sidecar_service: dict,

0 commit comments

Comments
 (0)