Skip to content

Commit 6615e9b

Browse files
pcrespovpcrespov
committed
rm project dependency
1 parent caa2799 commit 6615e9b

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ def _convert_to_pipeline_details(
457457
# send a valid project with sleepers
458458
task_out = await create_pipeline(
459459
async_client,
460-
project=sleepers_project,
460+
project_uuid=sleepers_project.uuid,
461461
user_id=user["id"],
462462
start_pipeline=True,
463463
product_name=osparc_product_name,
@@ -503,7 +503,7 @@ def _convert_to_pipeline_details(
503503
):
504504
await create_pipeline(
505505
async_client,
506-
project=sleepers_project,
506+
project_uuid=sleepers_project.uuid,
507507
user_id=user["id"],
508508
start_pipeline=True,
509509
product_name=osparc_product_name,
@@ -525,7 +525,7 @@ def _convert_to_pipeline_details(
525525
)
526526
task_out = await create_pipeline(
527527
async_client,
528-
project=sleepers_project,
528+
project_uuid=sleepers_project.uuid,
529529
user_id=user["id"],
530530
start_pipeline=True,
531531
product_name=osparc_product_name,
@@ -575,7 +575,7 @@ async def test_run_computation(
575575
# send a valid project with sleepers
576576
task_out = await create_pipeline(
577577
async_client,
578-
project=sleepers_project,
578+
project_uuid=sleepers_project.uuid,
579579
user_id=user["id"],
580580
start_pipeline=True,
581581
product_name=osparc_product_name,
@@ -622,7 +622,7 @@ async def test_run_computation(
622622
):
623623
await create_pipeline(
624624
async_client,
625-
project=sleepers_project,
625+
project_uuid=sleepers_project.uuid,
626626
user_id=user["id"],
627627
start_pipeline=True,
628628
product_name=osparc_product_name,
@@ -646,7 +646,7 @@ async def test_run_computation(
646646
expected_pipeline_details_forced.progress = 0
647647
task_out = await create_pipeline(
648648
async_client,
649-
project=sleepers_project,
649+
project_uuid=sleepers_project.uuid,
650650
user_id=user["id"],
651651
start_pipeline=True,
652652
product_name=osparc_product_name,
@@ -699,7 +699,7 @@ async def test_abort_computation(
699699
# send a valid project with sleepers
700700
task_out = await create_pipeline(
701701
async_client,
702-
project=sleepers_project,
702+
project_uuid=sleepers_project.uuid,
703703
user_id=user["id"],
704704
start_pipeline=True,
705705
product_name=osparc_product_name,
@@ -776,7 +776,7 @@ async def test_update_and_delete_computation(
776776
# send a valid project with sleepers
777777
task_out = await create_pipeline(
778778
async_client,
779-
project=sleepers_project,
779+
project_uuid=sleepers_project.uuid,
780780
user_id=user["id"],
781781
start_pipeline=False,
782782
product_name=osparc_product_name,
@@ -795,7 +795,7 @@ async def test_update_and_delete_computation(
795795
# update the pipeline
796796
task_out = await create_pipeline(
797797
async_client,
798-
project=sleepers_project,
798+
project_uuid=sleepers_project.uuid,
799799
user_id=user["id"],
800800
start_pipeline=False,
801801
product_name=osparc_product_name,
@@ -814,7 +814,7 @@ async def test_update_and_delete_computation(
814814
# update the pipeline
815815
task_out = await create_pipeline(
816816
async_client,
817-
project=sleepers_project,
817+
project_uuid=sleepers_project.uuid,
818818
user_id=user["id"],
819819
start_pipeline=False,
820820
product_name=osparc_product_name,
@@ -833,7 +833,7 @@ async def test_update_and_delete_computation(
833833
# start it now
834834
task_out = await create_pipeline(
835835
async_client,
836-
project=sleepers_project,
836+
project_uuid=sleepers_project.uuid,
837837
user_id=user["id"],
838838
start_pipeline=True,
839839
product_name=osparc_product_name,
@@ -864,7 +864,7 @@ async def test_update_and_delete_computation(
864864
with pytest.raises(httpx.HTTPStatusError, match=f"{status.HTTP_409_CONFLICT}"):
865865
await create_pipeline(
866866
async_client,
867-
project=sleepers_project,
867+
project_uuid=sleepers_project.uuid,
868868
user_id=user["id"],
869869
start_pipeline=False,
870870
product_name=osparc_product_name,
@@ -917,7 +917,7 @@ async def test_pipeline_with_no_computational_services_still_create_correct_comp
917917
):
918918
await create_pipeline(
919919
async_client,
920-
project=project_with_dynamic_node,
920+
project_uuid=project_with_dynamic_node.uuid,
921921
user_id=user["id"],
922922
start_pipeline=True,
923923
product_name=osparc_product_name,
@@ -927,7 +927,7 @@ async def test_pipeline_with_no_computational_services_still_create_correct_comp
927927
# still this pipeline shall be createable if we do not want to start it
928928
await create_pipeline(
929929
async_client,
930-
project=project_with_dynamic_node,
930+
project_uuid=project_with_dynamic_node.uuid,
931931
user_id=user["id"],
932932
start_pipeline=False,
933933
product_name=osparc_product_name,
@@ -1124,7 +1124,7 @@ async def test_burst_create_computations(
11241124
[
11251125
create_pipeline(
11261126
async_client,
1127-
project=sleepers_project,
1127+
project_uuid=sleepers_project.uuid,
11281128
user_id=user["id"],
11291129
product_name=osparc_product_name,
11301130
product_api_base_url=osparc_product_api_base_url,
@@ -1135,7 +1135,7 @@ async def test_burst_create_computations(
11351135
+ [
11361136
create_pipeline(
11371137
async_client,
1138-
project=sleepers_project2,
1138+
project_uuid=sleepers_project2.uuid,
11391139
user_id=user["id"],
11401140
product_name=osparc_product_name,
11411141
product_api_base_url=osparc_product_api_base_url,
@@ -1153,7 +1153,7 @@ async def test_burst_create_computations(
11531153
[
11541154
create_pipeline(
11551155
async_client,
1156-
project=sleepers_project,
1156+
project_uuid=sleepers_project.uuid,
11571157
user_id=user["id"],
11581158
product_name=osparc_product_name,
11591159
product_api_base_url=osparc_product_api_base_url,
@@ -1164,7 +1164,7 @@ async def test_burst_create_computations(
11641164
+ [
11651165
create_pipeline(
11661166
async_client,
1167-
project=sleepers_project2,
1167+
project_uuid=sleepers_project2.uuid,
11681168
user_id=user["id"],
11691169
product_name=osparc_product_name,
11701170
product_api_base_url=osparc_product_api_base_url,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ async def current_study(
305305
# create entries in comp_task table in order to pull output ports
306306
await create_pipeline(
307307
async_client,
308-
project=project_at_db,
308+
project_uuid=project_at_db.uuid,
309309
user_id=current_user["id"],
310310
start_pipeline=False,
311311
product_name=osparc_product_name,
@@ -993,7 +993,7 @@ async def test_nodeports_integration(
993993
# STEP 2
994994
task_out = await create_pipeline(
995995
async_client,
996-
project=current_study,
996+
project_uuid=current_study.uuid,
997997
user_id=current_user["id"],
998998
start_pipeline=True,
999999
product_name=osparc_product_name,

‎services/director-v2/tests/integration/conftest.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import pytest
1313
import sqlalchemy as sa
1414
from models_library.api_schemas_directorv2.computations import ComputationGet
15-
from models_library.projects import ProjectAtDB
15+
from models_library.projects import ProjectID
1616
from models_library.users import UserID
1717
from pytest_mock import MockerFixture
1818
from pytest_simcore.helpers.typing_env import EnvVarsDict
@@ -95,7 +95,7 @@ async def create_pipeline(
9595
async def _creator(
9696
client: httpx.AsyncClient,
9797
*,
98-
project: ProjectAtDB,
98+
project_uuid: ProjectID,
9999
user_id: UserID,
100100
product_name: str,
101101
product_api_base_url: str,
@@ -106,7 +106,7 @@ async def _creator(
106106
COMPUTATION_URL,
107107
json={
108108
"user_id": user_id,
109-
"project_id": str(project.uuid),
109+
"project_id": str(project_uuid),
110110
"start_pipeline": start_pipeline,
111111
"product_name": product_name,
112112
"product_api_base_url": product_api_base_url,

0 commit comments

Comments
 (0)