improving test

Author: sanderegg

services/autoscaling/tests/unit/conftest.py

@@ -30,6 +30,7 @@
     Resources,
 )
 from common_library.json_serialization import json_dumps
+from dask_task_models_library.container_tasks.utils import generate_dask_job_id
 from deepdiff import DeepDiff
 from faker import Faker
 from fakeredis.aioredis import FakeRedis
@@ -52,7 +53,11 @@
     Service,
     TaskSpec,
 )
+from models_library.projects import ProjectID
+from models_library.projects_nodes_io import NodeID
 from models_library.services_metadata_runtime import SimcoreContainerLabels
+from models_library.services_types import ServiceKey, ServiceVersion
+from models_library.users import UserID
 from pydantic import ByteSize, NonNegativeInt, PositiveInt, TypeAdapter
 from pytest_mock import MockType
 from pytest_mock.plugin import MockerFixture
@@ -857,9 +862,55 @@ def _creator(**cluter_overrides) -> Cluster:
     return _creator
 
 
+@pytest.fixture
+def service_version() -> ServiceVersion:
+    return "1.0.234"
+
+
+@pytest.fixture
+def service_key() -> ServiceKey:
+    return "simcore/services/dynamic/test"
+
+
+@pytest.fixture
+def node_id(faker: Faker) -> NodeID:
+    return faker.uuid4(cast_to=None)
+
+
+@pytest.fixture
+def project_id(faker: Faker) -> ProjectID:
+    return faker.uuid4(cast_to=None)
+
+
+@pytest.fixture
+def user_id(faker: Faker) -> UserID:
+    return faker.pyint(min_value=1)
+
+
+@pytest.fixture
+def fake_dask_job_id(
+    service_key: ServiceKey,
+    service_version: ServiceVersion,
+    user_id: UserID,
+    project_id: ProjectID,
+    faker: Faker,
+) -> Callable[[], str]:
+    def _() -> str:
+        return generate_dask_job_id(
+            service_key=service_key,
+            service_version=service_version,
+            user_id=user_id,
+            project_id=project_id,
+            node_id=faker.uuid4(cast_to=None),
+        )
+
+    return _
+
+
 @pytest.fixture
 async def create_dask_task(
     dask_spec_cluster_client: distributed.Client,
+    fake_dask_job_id: Callable[[], str],
 ) -> Callable[..., distributed.Future]:
     def _remote_pytest_fct(x: int, y: int) -> int:
         return x + y
@@ -874,6 +925,7 @@ def _creator(
             43,
             resources=required_resources,
             pure=False,
+            key=fake_dask_job_id(),
             **overrides,
         )
         assert future

services/autoscaling/tests/unit/test_modules_cluster_scaling_computational.py

@@ -126,10 +126,14 @@ def _assert_rabbit_autoscaling_message_sent(
         instances_running=0,
     )
     expected_message = default_message.model_copy(update=message_update_kwargs)
-    mock_rabbitmq_post_message.assert_called_once_with(
-        app,
-        expected_message,
-    )
+    # in this mock we get all kind of messages, we just want to assert one of them is the expected one and there is only one
+    autoscaling_status_messages = [
+        call_args.args[1]
+        for call_args in mock_rabbitmq_post_message.call_args_list
+        if isinstance(call_args.args[1], RabbitAutoscalingStatusMessage)
+    ]
+    assert len(autoscaling_status_messages) == 1, "too many messages sent"
+    assert autoscaling_status_messages[0] == expected_message
 
 
 @pytest.fixture

services/autoscaling/tests/unit/test_modules_dask.py

@@ -124,7 +124,7 @@ async def test_list_unrunnable_tasks(
     # we have nothing running now
     assert await list_unrunnable_tasks(scheduler_url, scheduler_authentication) == []
     # start a task that cannot run
-    dask_task_impossible_resources = DaskTaskResources(XRAM=213, threads=1)
+    dask_task_impossible_resources = DaskTaskResources(XRAM=213, threads=1)  # type: ignore
     future = create_dask_task(dask_task_impossible_resources)
     assert future
     assert await list_unrunnable_tasks(scheduler_url, scheduler_authentication) == [
@@ -168,7 +168,7 @@ def _add_fct(x: int, y: int) -> int:
         next(iter(dask_spec_cluster_client.scheduler_info()["workers"])): [
             DaskTask(
                 task_id=DaskTaskId(future_queued_task.key),
-                required_resources=DaskTaskResources(threads=1),
+                required_resources=DaskTaskResources(threads=1),  # type: ignore
             )
         ]
     }

services/autoscaling/tests/unit/test_utils_rabbitmq.py

@@ -122,31 +122,6 @@ async def _(labels: dict[DockerLabelKey, str]) -> list[Task]:
     return _
 
 
-@pytest.fixture
-def service_version() -> ServiceVersion:
-    return "1.0.0"
-
-
-@pytest.fixture
-def service_key() -> ServiceKey:
-    return "simcore/services/dynamic/test"
-
-
-@pytest.fixture
-def node_id(faker: Faker) -> NodeID:
-    return faker.uuid4(cast_to=None)
-
-
-@pytest.fixture
-def project_id(faker: Faker) -> ProjectID:
-    return faker.uuid4(cast_to=None)
-
-
-@pytest.fixture
-def user_id(faker: Faker) -> UserID:
-    return faker.pyint(min_value=1)
-
-
 @pytest.fixture
 def dask_task(
     service_key: ServiceKey,