fix test

Author: matusdrobuliak66

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_db_repositories_comp_runs.py

@@ -587,7 +587,7 @@ async def test_list_group_by_collection_run_id(
     total_count, items = await CompRunsRepository(
         sqlalchemy_async_engine
     ).list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name", "osparc"),
+        product_name=run_metadata.get("product_name"),
         user_id=published_project_1.user["id"],
         offset=0,
         limit=10,
@@ -682,7 +682,7 @@ async def test_list_group_by_collection_run_id_with_mixed_states_returns_started
 
     # Test the list_group_by_collection_run_id function
     total_count, items = await repo.list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name", "osparc"),
+        product_name=run_metadata.get("product_name"),
         user_id=published_project_1.user["id"],
         offset=0,
         limit=10,
@@ -748,7 +748,7 @@ async def test_list_group_by_collection_run_id_all_success_returns_success(
 
     # Test the function
     total_count, items = await repo.list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name", "osparc"),
+        product_name=run_metadata.get("product_name"),
         user_id=published_project_1.user["id"],
         offset=0,
         limit=10,
@@ -815,7 +815,7 @@ async def test_list_group_by_collection_run_id_with_failed_returns_failed(
 
     # Test the function
     total_count, items = await repo.list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name", "osparc"),
+        product_name=run_metadata.get("product_name"),
         user_id=published_project_1.user["id"],
         offset=0,
         limit=10,
@@ -880,7 +880,7 @@ async def test_list_group_by_collection_run_id_with_aborted_returns_aborted(
 
     # Test the function
     total_count, items = await repo.list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name", "osparc"),
+        product_name=run_metadata.get("product_name"),
         user_id=published_project_1.user["id"],
         offset=0,
         limit=10,
@@ -945,7 +945,7 @@ async def test_list_group_by_collection_run_id_with_unknown_returns_unknown(
 
     # Test the function
     total_count, items = await repo.list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name", "osparc"),
+        product_name=run_metadata.get("product_name"),
         user_id=published_project_1.user["id"],
         offset=0,
         limit=10,
@@ -1004,7 +1004,7 @@ async def test_list_group_by_collection_run_id_with_project_filter(
 
     # Test with project filter for only first two projects
     total_count, items = await repo.list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name", "osparc"),
+        product_name=run_metadata.get("product_name"),
         user_id=published_project_1.user["id"],
         project_ids=[
             published_project_1.project.uuid,
@@ -1051,7 +1051,7 @@ async def test_list_group_by_collection_run_id_pagination(
 
     # Test first page
     total_count, items = await repo.list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name", "osparc"),
+        product_name=run_metadata.get("product_name"),
         user_id=published_project.user["id"],
         offset=0,
         limit=2,
@@ -1062,7 +1062,7 @@ async def test_list_group_by_collection_run_id_pagination(
 
     # Test second page
     total_count, items = await repo.list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name", "osparc"),
+        product_name=run_metadata.get("product_name"),
         user_id=published_project.user["id"],
         offset=2,
         limit=2,
@@ -1073,7 +1073,7 @@ async def test_list_group_by_collection_run_id_pagination(
 
     # Test last page
     total_count, items = await repo.list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name", "osparc"),
+        product_name=run_metadata.get("product_name"),
         user_id=published_project.user["id"],
         offset=4,
         limit=2,
@@ -1092,7 +1092,7 @@ async def test_list_group_by_collection_run_id_empty_result(
     repo = CompRunsRepository(sqlalchemy_async_engine)
 
     total_count, items = await repo.list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name", "osparc"),
+        product_name=run_metadata.get("product_name"),
         user_id=fake_user_id,
         offset=0,
         limit=10,
@@ -1143,7 +1143,7 @@ async def test_list_group_by_collection_run_id_with_different_users(
 
     # Test for user1 - should only see their own runs
     total_count, items = await repo.list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name", "osparc"),
+        product_name=run_metadata.get("product_name"),
         user_id=user1["id"],
         offset=0,
         limit=10,
@@ -1158,7 +1158,7 @@ async def test_list_group_by_collection_run_id_with_different_users(
 
     # Test for user2 - should only see their own runs
     total_count, items = await repo.list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name", "osparc"),
+        product_name=run_metadata.get("product_name"),
         user_id=user2["id"],
         offset=0,
         limit=10,
@@ -1217,7 +1217,7 @@ async def test_list_group_by_collection_run_id_state_priority_precedence(
 
     # Test the function
     total_count, items = await repo.list_group_by_collection_run_id(
-        product_name=run_metadata.get("product_name", "osparc"),
+        product_name=run_metadata.get("product_name"),
         user_id=published_projects[0].user["id"],
         offset=0,
         limit=10,

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_manager.py

@@ -18,6 +18,7 @@
 import pytest
 from _helpers import PublishedProject, assert_comp_runs, assert_comp_runs_empty
 from fastapi import FastAPI
+from models_library.computations import CollectionRunID
 from models_library.projects import ProjectAtDB
 from models_library.projects_state import RunningState
 from pytest_mock.plugin import MockerFixture
@@ -146,6 +147,7 @@ async def test_schedule_all_pipelines(
     sqlalchemy_async_engine: AsyncEngine,
     run_metadata: RunMetadataDict,
     scheduler_rabbit_client_parser: mock.AsyncMock,
+    fake_collection_run_id: CollectionRunID,
 ):
     await assert_comp_runs_empty(sqlalchemy_async_engine)
     assert published_project.project.prj_owner
@@ -156,6 +158,7 @@ async def test_schedule_all_pipelines(
         project_id=published_project.project.uuid,
         run_metadata=run_metadata,
         use_on_demand_clusters=False,
+        collection_run_id=fake_collection_run_id,
     )
     # this directly schedule a new pipeline
     scheduler_rabbit_client_parser.assert_called_once_with(
@@ -247,6 +250,7 @@ async def test_schedule_all_pipelines_logs_error_if_it_find_old_pipelines(
     run_metadata: RunMetadataDict,
     scheduler_rabbit_client_parser: mock.AsyncMock,
     caplog: pytest.LogCaptureFixture,
+    fake_collection_run_id: CollectionRunID,
 ):
     await assert_comp_runs_empty(sqlalchemy_async_engine)
     assert published_project.project.prj_owner
@@ -257,6 +261,7 @@ async def test_schedule_all_pipelines_logs_error_if_it_find_old_pipelines(
         project_id=published_project.project.uuid,
         run_metadata=run_metadata,
         use_on_demand_clusters=False,
+        collection_run_id=fake_collection_run_id,
     )
     # this directly schedule a new pipeline
     scheduler_rabbit_client_parser.assert_called_once_with(
@@ -327,6 +332,7 @@ async def test_empty_pipeline_is_not_scheduled(
     sqlalchemy_async_engine: AsyncEngine,
     scheduler_rabbit_client_parser: mock.AsyncMock,
     caplog: pytest.LogCaptureFixture,
+    fake_collection_run_id: CollectionRunID,
 ):
     await assert_comp_runs_empty(sqlalchemy_async_engine)
     user = create_registered_user()
@@ -340,6 +346,7 @@ async def test_empty_pipeline_is_not_scheduled(
             project_id=empty_project.uuid,
             run_metadata=run_metadata,
             use_on_demand_clusters=False,
+            collection_run_id=fake_collection_run_id,
         )
     await assert_comp_runs_empty(sqlalchemy_async_engine)
     scheduler_rabbit_client_parser.assert_not_called()
@@ -355,6 +362,7 @@ async def test_empty_pipeline_is_not_scheduled(
             project_id=empty_project.uuid,
             run_metadata=run_metadata,
             use_on_demand_clusters=False,
+            collection_run_id=fake_collection_run_id,
         )
     assert len(caplog.records) == 1
     assert "no computational dag defined" in caplog.records[0].message

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_scheduler_dask.py

@@ -11,6 +11,7 @@
 
 import asyncio
 import datetime
+from calendar import c
 from collections.abc import AsyncIterator, Awaitable, Callable
 from copy import deepcopy
 from dataclasses import dataclass
@@ -32,6 +33,7 @@
 from dask_task_models_library.container_tasks.protocol import TaskOwner
 from faker import Faker
 from fastapi.applications import FastAPI
+from models_library.computations import CollectionRunID
 from models_library.projects import ProjectAtDB, ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.projects_state import RunningState
@@ -164,6 +166,7 @@ async def _assert_start_pipeline(
     published_project: PublishedProject,
     run_metadata: RunMetadataDict,
     computational_pipeline_rabbit_client_parser: mock.AsyncMock,
+    fake_collection_run_id: CollectionRunID,
 ) -> tuple[CompRunsAtDB, list[CompTaskAtDB]]:
     exp_published_tasks = deepcopy(published_project.tasks)
     assert published_project.project.prj_owner
@@ -173,6 +176,7 @@ async def _assert_start_pipeline(
         project_id=published_project.project.uuid,
         run_metadata=run_metadata,
         use_on_demand_clusters=False,
+        collection_run_id=fake_collection_run_id,
     )
 
     # check the database is correctly updated, the run is published
@@ -472,6 +476,7 @@ async def test_proper_pipeline_is_scheduled(  # noqa: PLR0915
     resource_tracking_rabbit_client_parser: mock.AsyncMock,
     computational_pipeline_rabbit_client_parser: mock.AsyncMock,
     run_metadata: RunMetadataDict,
+    fake_collection_run_id: CollectionRunID,
 ):
     with_disabled_auto_scheduling.assert_called_once()
     _with_mock_send_computation_tasks(published_project.tasks, mocked_dask_client)
@@ -485,6 +490,7 @@ async def test_proper_pipeline_is_scheduled(  # noqa: PLR0915
         published_project=published_project,
         run_metadata=run_metadata,
         computational_pipeline_rabbit_client_parser=computational_pipeline_rabbit_client_parser,
+        collection_run_id=fake_collection_run_id,
     )
     with_disabled_scheduler_publisher.assert_called()
 
@@ -965,6 +971,7 @@ async def with_started_project(
     instrumentation_rabbit_client_parser: mock.AsyncMock,
     resource_tracking_rabbit_client_parser: mock.AsyncMock,
     computational_pipeline_rabbit_client_parser: mock.AsyncMock,
+    fake_collection_run_id: CollectionRunID,
 ) -> RunningProject:
     with_disabled_auto_scheduling.assert_called_once()
     published_project = await publish_project()
@@ -977,6 +984,7 @@ async def with_started_project(
         published_project=published_project,
         run_metadata=run_metadata,
         computational_pipeline_rabbit_client_parser=computational_pipeline_rabbit_client_parser,
+        collection_run_id=fake_collection_run_id,
     )
     with_disabled_scheduler_publisher.assert_called_once()
 
@@ -1210,6 +1218,7 @@ async def test_broken_pipeline_configuration_is_not_scheduled_and_aborted(
     sqlalchemy_async_engine: AsyncEngine,
     run_metadata: RunMetadataDict,
     computational_pipeline_rabbit_client_parser: mock.AsyncMock,
+    fake_collection_run_id: CollectionRunID,
 ):
     """A pipeline which comp_tasks are missing should not be scheduled.
     It shall be aborted and shown as such in the comp_runs db"""
@@ -1230,6 +1239,7 @@ async def test_broken_pipeline_configuration_is_not_scheduled_and_aborted(
         project_id=sleepers_project.uuid,
         run_metadata=run_metadata,
         use_on_demand_clusters=False,
+        collection_run_id=fake_collection_run_id,
     )
     with_disabled_scheduler_publisher.assert_called_once()
     # we shall have a a new comp_runs row with the new pipeline job
@@ -1282,6 +1292,7 @@ async def test_task_progress_triggers(
     mocked_clean_task_output_and_log_files_if_invalid: mock.Mock,
     run_metadata: RunMetadataDict,
     computational_pipeline_rabbit_client_parser: mock.AsyncMock,
+    fake_collection_run_id: CollectionRunID,
 ):
     _with_mock_send_computation_tasks(published_project.tasks, mocked_dask_client)
     _run_in_db, expected_published_tasks = await _assert_start_pipeline(
@@ -1290,6 +1301,7 @@ async def test_task_progress_triggers(
         published_project=published_project,
         run_metadata=run_metadata,
         computational_pipeline_rabbit_client_parser=computational_pipeline_rabbit_client_parser,
+        collection_run_id=fake_collection_run_id,
     )
 
     # -------------------------------------------------------------------------------
@@ -1357,6 +1369,7 @@ async def test_handling_of_disconnected_scheduler_dask(
     backend_error: ComputationalSchedulerError,
     run_metadata: RunMetadataDict,
     computational_pipeline_rabbit_client_parser: mock.AsyncMock,
+    fake_collection_run_id: CollectionRunID,
 ):
     # this will create a non connected backend issue that will trigger re-connection
     mocked_dask_client_send_task = mocker.patch(
@@ -1373,6 +1386,7 @@ async def test_handling_of_disconnected_scheduler_dask(
         project_id=published_project.project.uuid,
         run_metadata=run_metadata,
         use_on_demand_clusters=False,
+        collection_run_id=fake_collection_run_id,
     )
     await _assert_message_received(
         computational_pipeline_rabbit_client_parser,
@@ -1801,6 +1815,7 @@ async def test_running_pipeline_triggers_heartbeat(
     resource_tracking_rabbit_client_parser: mock.AsyncMock,
     run_metadata: RunMetadataDict,
     computational_pipeline_rabbit_client_parser: mock.AsyncMock,
+    fake_collection_run_id: CollectionRunID,
 ):
     _with_mock_send_computation_tasks(published_project.tasks, mocked_dask_client)
     run_in_db, expected_published_tasks = await _assert_start_pipeline(
@@ -1809,6 +1824,7 @@ async def test_running_pipeline_triggers_heartbeat(
         published_project=published_project,
         run_metadata=run_metadata,
         computational_pipeline_rabbit_client_parser=computational_pipeline_rabbit_client_parser,
+        collection_run_id=fake_collection_run_id,
     )
     # -------------------------------------------------------------------------------
     # 1. first run will move comp_tasks to PENDING so the dask-worker can take them
@@ -1918,6 +1934,7 @@ async def test_pipeline_with_on_demand_cluster_with_not_ready_backend_waits(
     mocked_get_or_create_cluster: mock.Mock,
     faker: Faker,
     computational_pipeline_rabbit_client_parser: mock.AsyncMock,
+    fake_collection_run_id: CollectionRunID,
 ):
     mocked_get_or_create_cluster.side_effect = (
         ComputationalBackendOnDemandNotReadyError(
@@ -1932,6 +1949,7 @@ async def test_pipeline_with_on_demand_cluster_with_not_ready_backend_waits(
         project_id=published_project.project.uuid,
         run_metadata=run_metadata,
         use_on_demand_clusters=True,
+        collection_run_id=fake_collection_run_id,
     )
 
     # we ask to use an on-demand cluster, therefore the tasks are published first
@@ -2038,6 +2056,7 @@ async def test_pipeline_with_on_demand_cluster_with_no_clusters_keeper_fails(
     mocked_get_or_create_cluster: mock.Mock,
     get_or_create_exception: Exception,
     computational_pipeline_rabbit_client_parser: mock.AsyncMock,
+    fake_collection_run_id: CollectionRunID,
 ):
     # needs to change: https://github.com/ITISFoundation/osparc-simcore/issues/6817
 
@@ -2050,6 +2069,7 @@ async def test_pipeline_with_on_demand_cluster_with_no_clusters_keeper_fails(
         project_id=published_project.project.uuid,
         run_metadata=run_metadata,
         use_on_demand_clusters=True,
+        collection_run_id=fake_collection_run_id,
     )
 
     # we ask to use an on-demand cluster, therefore the tasks are published first
@@ -2151,6 +2171,7 @@ async def test_run_new_pipeline_called_twice_prevents_duplicate_runs(
     published_project: PublishedProject,
     run_metadata: RunMetadataDict,
     computational_pipeline_rabbit_client_parser: mock.AsyncMock,
+    fake_collection_run_id: CollectionRunID,
 ):
     # Ensure we start with an empty database
     await assert_comp_runs_empty(sqlalchemy_async_engine)
@@ -2163,6 +2184,7 @@ async def test_run_new_pipeline_called_twice_prevents_duplicate_runs(
         project_id=published_project.project.uuid,
         run_metadata=run_metadata,
         use_on_demand_clusters=False,
+        collection_run_id=fake_collection_run_id,
     )
 
     # Verify first run was created and published
@@ -2191,6 +2213,7 @@ async def test_run_new_pipeline_called_twice_prevents_duplicate_runs(
         project_id=published_project.project.uuid,
         run_metadata=run_metadata,
         use_on_demand_clusters=False,
+        collection_run_id=fake_collection_run_id,
     )
 
     # Verify still only one run exists with same run_id