rename

Author: sanderegg

packages/pytest-simcore/src/pytest_simcore/db_entries_mocks.py

@@ -82,7 +82,7 @@ async def with_product(
 
 
 @pytest.fixture
-async def project(
+async def create_project(
     sqlalchemy_async_engine: AsyncEngine, faker: Faker, product_name: ProductName
 ) -> AsyncIterator[Callable[..., Awaitable[ProjectAtDB]]]:
     created_project_ids: list[str] = []

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

@@ -193,13 +193,13 @@ async def test_start_empty_computation_is_refused(
     async_client: httpx.AsyncClient,
     create_registered_user: Callable,
     with_product: dict[str, Any],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     osparc_product_name: str,
     osparc_product_api_base_url: str,
     create_pipeline: Callable[..., Awaitable[ComputationGet]],
 ):
     user = create_registered_user()
-    empty_project = await project(user)
+    empty_project = await create_project(user)
     with pytest.raises(
         httpx.HTTPStatusError, match=f"{status.HTTP_422_UNPROCESSABLE_ENTITY}"
     ):
@@ -399,7 +399,7 @@ async def test_run_partial_computation(
     async_client: httpx.AsyncClient,
     create_registered_user: Callable,
     with_product: dict[str, Any],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     update_project_workbench_with_comp_tasks: Callable,
     fake_workbench_without_outputs: dict[str, Any],
     params: PartialComputationParams,
@@ -409,7 +409,7 @@ async def test_run_partial_computation(
 ):
     user = create_registered_user()
     await wait_for_catalog_service(user["id"], osparc_product_name)
-    sleepers_project: ProjectAtDB = await project(
+    sleepers_project: ProjectAtDB = await create_project(
         user, workbench=fake_workbench_without_outputs
     )
 
@@ -552,7 +552,7 @@ async def test_run_computation(
     async_client: httpx.AsyncClient,
     create_registered_user: Callable,
     with_product: dict[str, Any],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     fake_workbench_without_outputs: dict[str, Any],
     update_project_workbench_with_comp_tasks: Callable,
     fake_workbench_computational_pipeline_details: PipelineDetails,
@@ -563,7 +563,9 @@ async def test_run_computation(
 ):
     user = create_registered_user()
     await wait_for_catalog_service(user["id"], osparc_product_name)
-    sleepers_project = await project(user, workbench=fake_workbench_without_outputs)
+    sleepers_project = await create_project(
+        user, workbench=fake_workbench_without_outputs
+    )
     # send a valid project with sleepers
     task_out = await create_pipeline(
         async_client,
@@ -671,7 +673,7 @@ async def test_abort_computation(
     async_client: httpx.AsyncClient,
     create_registered_user: Callable,
     with_product: dict[str, Any],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     fake_workbench_without_outputs: dict[str, Any],
     fake_workbench_computational_pipeline_details: PipelineDetails,
     osparc_product_name: str,
@@ -685,7 +687,9 @@ async def test_abort_computation(
             node["inputs"].setdefault("in_2", 120)
             if not isinstance(node["inputs"]["in_2"], dict):
                 node["inputs"]["in_2"] = 120
-    sleepers_project = await project(user, workbench=fake_workbench_without_outputs)
+    sleepers_project = await create_project(
+        user, workbench=fake_workbench_without_outputs
+    )
     # send a valid project with sleepers
     task_out = await create_pipeline(
         async_client,
@@ -751,7 +755,7 @@ async def test_update_and_delete_computation(
     async_client: httpx.AsyncClient,
     create_registered_user: Callable,
     with_product: dict[str, Any],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     fake_workbench_without_outputs: dict[str, Any],
     fake_workbench_computational_pipeline_details_not_started: PipelineDetails,
     fake_workbench_computational_pipeline_details: PipelineDetails,
@@ -760,7 +764,9 @@ async def test_update_and_delete_computation(
     create_pipeline: Callable[..., Awaitable[ComputationGet]],
 ):
     user = create_registered_user()
-    sleepers_project = await project(user, workbench=fake_workbench_without_outputs)
+    sleepers_project = await create_project(
+        user, workbench=fake_workbench_without_outputs
+    )
     # send a valid project with sleepers
     task_out = await create_pipeline(
         async_client,
@@ -880,15 +886,15 @@ async def test_pipeline_with_no_computational_services_still_create_correct_comp
     async_client: httpx.AsyncClient,
     create_registered_user: Callable,
     with_product: dict[str, Any],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     jupyter_service: dict[str, Any],
     osparc_product_name: str,
     osparc_product_api_base_url: str,
     create_pipeline: Callable[..., Awaitable[ComputationGet]],
 ):
     user = create_registered_user()
     # create a workbench with just a dynamic service
-    project_with_dynamic_node = await project(
+    project_with_dynamic_node = await create_project(
         user,
         workbench={
             "39e92f80-9286-5612-85d1-639fa47ec57d": {
@@ -927,14 +933,14 @@ async def test_pipeline_with_control_loop_made_of_dynamic_services_is_allowed(
     client: TestClient,
     create_registered_user: Callable,
     with_product: dict[str, Any],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     jupyter_service: dict[str, Any],
     osparc_product_name: str,
     osparc_product_api_base_url: str,
 ):
     user = create_registered_user()
     # create a workbench with just 2 dynamic service in a cycle
-    project_with_dynamic_node = await project(
+    project_with_dynamic_node = await create_project(
         user,
         workbench={
             "39e92f80-9286-5612-85d1-639fa47ec57d": {
@@ -999,15 +1005,15 @@ async def test_pipeline_with_cycle_containing_a_computational_service_is_forbidd
     client: TestClient,
     create_registered_user: Callable,
     with_product: dict[str, Any],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     sleeper_service: dict[str, Any],
     jupyter_service: dict[str, Any],
     osparc_product_name: str,
     osparc_product_api_base_url: str,
 ):
     user = create_registered_user()
     # create a workbench with just 2 dynamic service in a cycle
-    project_with_cycly_and_comp_service = await project(
+    project_with_cycly_and_comp_service = await create_project(
         user,
         workbench={
             "39e92f80-9286-5612-85d1-639fa47ec57d": {
@@ -1084,7 +1090,7 @@ async def test_burst_create_computations(
     async_client: httpx.AsyncClient,
     create_registered_user: Callable,
     with_product: dict[str, Any],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     fake_workbench_without_outputs: dict[str, Any],
     update_project_workbench_with_comp_tasks: Callable,
     fake_workbench_computational_pipeline_details: PipelineDetails,
@@ -1094,8 +1100,12 @@ async def test_burst_create_computations(
     create_pipeline: Callable[..., Awaitable[ComputationGet]],
 ):
     user = create_registered_user()
-    sleepers_project = await project(user, workbench=fake_workbench_without_outputs)
-    sleepers_project2 = await project(user, workbench=fake_workbench_without_outputs)
+    sleepers_project = await create_project(
+        user, workbench=fake_workbench_without_outputs
+    )
+    sleepers_project2 = await create_project(
+        user, workbench=fake_workbench_without_outputs
+    )
 
     NUMBER_OF_CALLS = 4
 

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

@@ -98,10 +98,10 @@ def user_id(user_db: dict[str, Any]) -> UserID:
 @pytest.fixture
 async def project_id(
     user_db: dict[str, Any],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     with_product: dict[str, Any],
 ) -> str:
-    prj = await project(user=user_db)
+    prj = await create_project(user=user_db)
     return f"{prj.uuid}"
 
 

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

@@ -135,7 +135,9 @@ class InputsOutputs(NamedTuple):
 DY_SERVICES_STATE_PATH: Path = Path(DY_VOLUMES) / "workdir/generated-data"
 DY_SERVICES_R_CLONE_DIR_NAME: str = (
     # pylint: disable=bad-str-strip-call
-    str(DY_SERVICES_STATE_PATH).strip(DY_VOLUMES).replace("/", "_")
+    str(DY_SERVICES_STATE_PATH)
+    .strip(DY_VOLUMES)
+    .replace("/", "_")
 )
 TIMEOUT_DETECT_DYNAMIC_SERVICES_STOPPED = 60
 TIMEOUT_OUTPUTS_UPLOAD_FINISH_DETECTED = 60
@@ -260,7 +262,7 @@ def current_user(create_registered_user: Callable) -> dict[str, Any]:
 @pytest.fixture
 async def current_study(
     current_user: dict[str, Any],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     fake_dy_workbench: dict[str, Any],
     sleeper_service: dict,
     dy_static_file_server_dynamic_sidecar_service: dict,
@@ -298,7 +300,7 @@ async def current_study(
     )
 
     # create project for this user
-    project_at_db = await project(current_user, workbench=fake_dy_workbench)
+    project_at_db = await create_project(current_user, workbench=fake_dy_workbench)
 
     # create entries in comp_task table in order to pull output ports
     await create_pipeline(
@@ -639,19 +641,19 @@ async def _container_id_via_services(service_uuid: str) -> str:
             if service["Spec"]["Name"] == service_name:
                 service_id = service["ID"]
                 break
-        assert service_id is not None, (
-            f"No service found for service name: {service_name}"
-        )
+        assert (
+            service_id is not None
+        ), f"No service found for service name: {service_name}"
 
         for task in await docker_client.tasks.list():
             if task["ServiceID"] == service_id:
                 assert task["Status"]["State"] == "running"
                 container_id = task["Status"]["ContainerStatus"]["ContainerID"]
                 break
 
-    assert container_id is not None, (
-        f"No container found for service name {service_name}"
-    )
+    assert (
+        container_id is not None
+    ), f"No container found for service name {service_name}"
 
     return container_id
 
@@ -912,9 +914,9 @@ async def _assert_retrieve_completed(
                         container.log(stdout=True, stderr=True),
                     )
                 )
-                assert _CONTROL_TESTMARK_DY_SIDECAR_NODEPORT_UPLOADED_MESSAGE in logs, (
-                    "TIP: Message missing suggests that the data was never uploaded: look in services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/nodeports.py"
-                )
+                assert (
+                    _CONTROL_TESTMARK_DY_SIDECAR_NODEPORT_UPLOADED_MESSAGE in logs
+                ), "TIP: Message missing suggests that the data was never uploaded: look in services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/nodeports.py"
 
 
 def product_name(osparc_product_name: ProductName) -> ProductName:
@@ -976,16 +978,16 @@ async def test_nodeports_integration(
     `aioboto` instead of `docker` or `storage-data_manager API`.
     """
     # STEP 1
-    dynamic_services_urls: dict[
-        str, str
-    ] = await _start_and_wait_for_dynamic_services_ready(
-        director_v2_client=async_client,
-        product_name=osparc_product_name,
-        product_api_base_url=osparc_product_api_base_url,
-        user_id=current_user["id"],
-        workbench_dynamic_services=workbench_dynamic_services,
-        current_study=current_study,
-        catalog_url=services_endpoint["catalog"],
+    dynamic_services_urls: dict[str, str] = (
+        await _start_and_wait_for_dynamic_services_ready(
+            director_v2_client=async_client,
+            product_name=osparc_product_name,
+            product_api_base_url=osparc_product_api_base_url,
+            user_id=current_user["id"],
+            workbench_dynamic_services=workbench_dynamic_services,
+            current_study=current_study,
+            catalog_url=services_endpoint["catalog"],
+        )
     )
 
     # STEP 2

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

@@ -140,7 +140,7 @@ async def dy_static_file_server_project(
     minimal_configuration: None,
     user_dict: dict[str, Any],
     with_product: dict[str, Any],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     dy_static_file_server_service: dict,
     dy_static_file_server_dynamic_sidecar_service: dict,
     dy_static_file_server_dynamic_sidecar_compose_spec_service: dict,
@@ -155,7 +155,7 @@ def _assemble_node_data(spec: dict, label: str) -> dict[str, str]:
             "label": label,
         }
 
-    return await project(
+    return await create_project(
         user=user_dict,
         workbench={
             uuid_legacy: _assemble_node_data(