fixing tests

Author: sanderegg

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

@@ -35,7 +35,7 @@ def create_registered_user(
 ) -> Iterator[Callable[..., dict]]:
     created_user_ids = []
 
-    def creator(**user_kwargs) -> dict[str, Any]:
+    def _(**user_kwargs) -> dict[str, Any]:
         with postgres_db.connect() as con:
             # removes all users before continuing
             user_config = {
@@ -61,7 +61,7 @@ def creator(**user_kwargs) -> dict[str, Any]:
             created_user_ids.append(user["id"])
         return dict(user._asdict())
 
-    yield creator
+    yield _
 
     with postgres_db.connect() as con:
         con.execute(users.delete().where(users.c.id.in_(created_user_ids)))
@@ -87,7 +87,7 @@ async def create_project(
 ) -> AsyncIterator[Callable[..., Awaitable[ProjectAtDB]]]:
     created_project_ids: list[str] = []
 
-    async def creator(
+    async def _(
         user: dict[str, Any],
         *,
         project_nodes_overrides: dict[str, Any] | None = None,
@@ -141,7 +141,7 @@ async def creator(
         created_project_ids.append(f"{inserted_project.uuid}")
         return inserted_project
 
-    yield creator
+    yield _
 
     # cleanup
     async with sqlalchemy_async_engine.begin() as con:
@@ -157,7 +157,7 @@ async def create_pipeline(
 ) -> AsyncIterator[Callable[..., Awaitable[dict[str, Any]]]]:
     created_pipeline_ids: list[str] = []
 
-    async def creator(**pipeline_kwargs) -> dict[str, Any]:
+    async def _(**pipeline_kwargs) -> dict[str, Any]:
         pipeline_config = {
             "project_id": f"{uuid4()}",
             "dag_adjacency_list": {},
@@ -175,7 +175,7 @@ async def creator(**pipeline_kwargs) -> dict[str, Any]:
             created_pipeline_ids.append(new_pipeline["project_id"])
             return new_pipeline
 
-    yield creator
+    yield _
 
     # cleanup
     async with sqlalchemy_async_engine.begin() as conn:
@@ -192,7 +192,7 @@ async def create_comp_task(
 ) -> AsyncIterator[Callable[..., Awaitable[dict[str, Any]]]]:
     created_task_ids: list[int] = []
 
-    async def creator(project_id: ProjectID, **task_kwargs) -> dict[str, Any]:
+    async def _(project_id: ProjectID, **task_kwargs) -> dict[str, Any]:
         task_config = {"project_id": f"{project_id}"} | task_kwargs
         async with sqlalchemy_async_engine.begin() as conn:
             result = await conn.execute(
@@ -205,7 +205,7 @@ async def creator(project_id: ProjectID, **task_kwargs) -> dict[str, Any]:
             created_task_ids.append(new_task["task_id"])
         return new_task
 
-    yield creator
+    yield _
 
     # cleanup
     async with sqlalchemy_async_engine.begin() as conn:
@@ -224,7 +224,7 @@ def grant_service_access_rights(
     """
     created_entries: list[tuple[str, str, int, str]] = []
 
-    def creator(
+    def _(
         *,
         service_key: str,
         service_version: str,
@@ -268,7 +268,7 @@ def creator(
             # Convert row to dict
             return dict(row._asdict())
 
-    yield creator
+    yield _
 
     # Cleanup all created entries
     with postgres_db.begin() as conn:

packages/simcore-sdk/tests/conftest.py

@@ -23,6 +23,7 @@
 pytest_plugins = [
     "pytest_simcore.aws_s3_service",
     "pytest_simcore.aws_server",
+    "pytest_simcore.db_entries_mocks",
     "pytest_simcore.disk_usage_monitoring",
     "pytest_simcore.docker_compose",
     "pytest_simcore.docker_swarm",
@@ -66,8 +67,7 @@ def empty_configuration_file() -> Path:
 @pytest.fixture
 def node_ports_config(
     postgres_host_config: PostgresTestConfig, minio_s3_settings_envs: EnvVarsDict
-) -> None:
-    ...
+) -> None: ...
 
 
 @pytest.fixture

services/director-v2/tests/unit/with_dbs/test_modules_db_repositories_projects.py

@@ -69,40 +69,40 @@ def workbench() -> dict[str, Any]:
 
 
 @pytest.fixture()
-async def project(
+async def with_project(
     mock_env: EnvVarsDict,
     create_registered_user: Callable[..., dict],
     with_product: dict[str, Any],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     workbench: dict[str, Any],
 ) -> ProjectAtDB:
-    return await project(create_registered_user(), workbench=workbench)
+    return await create_project(create_registered_user(), workbench=workbench)
 
 
 async def test_is_node_present_in_workbench(
-    initialized_app: FastAPI, project: ProjectAtDB, faker: Faker
+    initialized_app: FastAPI, with_project: ProjectAtDB, faker: Faker
 ):
     project_repository = get_repository(initialized_app, ProjectsRepository)
 
-    for node_uuid in project.workbench:
+    for node_uuid in with_project.workbench:
         assert (
             await project_repository.is_node_present_in_workbench(
-                project_id=project.uuid, node_uuid=NodeID(node_uuid)
+                project_id=with_project.uuid, node_uuid=NodeID(node_uuid)
             )
             is True
         )
 
     not_existing_node = faker.uuid4(cast_to=None)
-    assert not_existing_node not in project.workbench
+    assert not_existing_node not in with_project.workbench
     assert (
         await project_repository.is_node_present_in_workbench(
-            project_id=project.uuid, node_uuid=not_existing_node
+            project_id=with_project.uuid, node_uuid=not_existing_node
         )
         is False
     )
 
     not_existing_project = faker.uuid4(cast_to=None)
-    assert not_existing_project != project.uuid
+    assert not_existing_project != with_project.uuid
     assert (
         await project_repository.is_node_present_in_workbench(
             project_id=not_existing_project, node_uuid=not_existing_node
@@ -112,13 +112,13 @@ async def test_is_node_present_in_workbench(
 
 
 async def test_get_project_id_from_node(
-    initialized_app: FastAPI, project: ProjectAtDB, faker: Faker
+    initialized_app: FastAPI, with_project: ProjectAtDB, faker: Faker
 ):
     project_repository = get_repository(initialized_app, ProjectsRepository)
-    for node_uuid in project.workbench:
+    for node_uuid in with_project.workbench:
         assert (
             await project_repository.get_project_id_from_node(NodeID(node_uuid))
-            == project.uuid
+            == with_project.uuid
         )
 
     not_existing_node_id = faker.uuid4(cast_to=None)

services/director-v2/tests/unit/with_dbs/test_utils_rabbitmq.py

@@ -84,28 +84,28 @@ def user(create_registered_user: Callable[..., dict]) -> dict:
 
 
 @pytest.fixture
-async def project(
+async def with_project(
     user: dict[str, Any],
     fake_workbench_without_outputs: dict[str, Any],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     with_product: dict[str, Any],
 ) -> ProjectAtDB:
-    return await project(user, workbench=fake_workbench_without_outputs)
+    return await create_project(user, workbench=fake_workbench_without_outputs)
 
 
 @pytest.fixture
 async def tasks(
     user: dict[str, Any],
-    project: ProjectAtDB,
+    with_project: ProjectAtDB,
     fake_workbench_adjacency: dict[str, Any],
     create_pipeline: Callable[..., Awaitable[CompPipelineAtDB]],
     create_tasks_from_project: Callable[..., Awaitable[list[CompTaskAtDB]]],
 ) -> list[CompTaskAtDB]:
     await create_pipeline(
-        project_id=f"{project.uuid}",
+        project_id=f"{with_project.uuid}",
         dag_adjacency_list=fake_workbench_adjacency,
     )
-    comp_tasks = await create_tasks_from_project(user, project)
+    comp_tasks = await create_tasks_from_project(user, with_project)
     assert len(comp_tasks) > 0
     return comp_tasks
 
@@ -162,7 +162,7 @@ async def test_publish_service_stopped_metrics(
 async def test_publish_service_resource_tracking_started(
     create_rabbitmq_client: Callable[[str], RabbitMQClient],
     user: dict[str, Any],
-    project: ProjectAtDB,
+    with_project: ProjectAtDB,
     simcore_user_agent: str,
     tasks: list[CompTaskAtDB],
     mocked_message_parser: mock.AsyncMock,
@@ -191,10 +191,10 @@ async def test_publish_service_resource_tracking_started(
         simcore_user_agent=simcore_user_agent,
         user_id=user["id"],
         user_email=faker.email(),
-        project_id=project.uuid,
-        project_name=project.name,
+        project_id=with_project.uuid,
+        project_name=with_project.name,
         node_id=random_task.node_id,
-        node_name=project.workbench[NodeIDStr(f"{random_task.node_id}")].label,
+        node_name=with_project.workbench[NodeIDStr(f"{random_task.node_id}")].label,
         parent_project_id=None,
         parent_node_id=None,
         root_parent_project_id=None,