fixing tests

Author: sanderegg

services/director-v2/tests/conftest.py

@@ -43,6 +43,7 @@
     "pytest_simcore.docker_registry",
     "pytest_simcore.docker_swarm",
     "pytest_simcore.environment_configs",
+    "pytest_simcore.faker_products_data",
     "pytest_simcore.faker_projects_data",
     "pytest_simcore.faker_users_data",
     "pytest_simcore.minio_service",
@@ -355,7 +356,6 @@ async def wrapper(*args, **kwargs):
 
 @pytest.fixture
 def mock_osparc_variables_api_auth_rpc(mocker: MockerFixture) -> None:
-
     fake_data = ApiKeyGet.model_validate(ApiKeyGet.model_json_schema()["examples"][0])
 
     async def _create(

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

@@ -363,11 +363,6 @@ def _mocked_get_pricing_unit(request, pricing_plan_id: int) -> httpx.Response:
         yield respx_mock
 
 
-@pytest.fixture
-def product_name(faker: Faker) -> str:
-    return faker.name()
-
-
 @pytest.fixture
 def product_api_base_url(faker: Faker) -> AnyHttpUrl:
     return TypeAdapter(AnyHttpUrl).validate_python(faker.url())
@@ -911,7 +906,7 @@ async def test_get_computation_from_not_started_computation_task(
             node_states={
                 t.node_id: NodeState(
                     modified=True,
-                    currentStatus=RunningState.NOT_STARTED,
+                    current_status=RunningState.NOT_STARTED,
                     progress=None,
                     dependencies={
                         NodeID(node)
@@ -983,7 +978,7 @@ async def test_get_computation_from_published_computation_task(
             node_states={
                 t.node_id: NodeState(
                     modified=True,
-                    currentStatus=RunningState.PUBLISHED,
+                    current_status=RunningState.PUBLISHED,
                     dependencies={
                         NodeID(node)
                         for node, next_nodes in fake_workbench_adjacency.items()

services/web/server/tests/unit/with_dbs/04/notifications/test_notifications__db_comp_tasks_listening_task.py

@@ -304,9 +304,6 @@ async def _update_first_jupyter_task_output(
     ) -> None:
         with log_context(logging.INFO, msg=f"Updating output {port_index + 1}"):
             async with sqlalchemy_async_engine.begin() as conn:
-                # For JSON columns, we need to use jsonb_set or fetch-modify-update
-                # Since it's JSON (not JSONB), let's use the safer fetch-modify approach
-                # Use SELECT FOR UPDATE to lock the row for concurrent access
                 result = await conn.execute(
                     comp_tasks.select()
                     .with_only_columns([comp_tasks.c.outputs])
@@ -326,13 +323,6 @@ async def _update_first_jupyter_task_output(
                     .where(comp_tasks.c.task_id == first_jupyter_task["task_id"])
                 )
 
-    # await asyncio.gather(
-    #     *(
-    #         _update_first_jupyter_task_output(i, {"data": i})
-    #         for i in range(number_of_inputs_linked)
-    #     )
-    # )
-
     @delayed_start(timedelta(seconds=2))
     async def _change_outputs_sequentially(sleep: float = 0.1) -> None:
         """
@@ -383,6 +373,6 @@ async def _check_retrieve_rpc_called(expected_ports_retrieved: int) -> None:
                     )
 
     await _check_for_stability(_check_retrieve_rpc_called, number_of_inputs_linked)
-
+    await asyncio.wait_for(sequential_task, timeout=60)
     assert sequential_task.done(), "Sequential task did not complete"
     assert not sequential_task.cancelled(), "Sequential task was cancelled unexpectedly"