♻️ Update create_fake_service_data type to CreateFakeServiceDataCallable across test files

Author: pcrespov

services/catalog/tests/unit/with_dbs/test_api_rest_services__list.py

@@ -14,6 +14,7 @@
 from models_library.services import ServiceMetaDataPublished
 from models_library.users import UserID
 from pydantic import TypeAdapter
+from pytest_simcore.helpers.catalog_services import CreateFakeServiceDataCallable
 from respx.router import MockRouter
 from starlette import status
 from starlette.testclient import TestClient
@@ -33,7 +34,7 @@ async def test_list_services_with_details(
     mocked_director_rest_api_base: MockRouter,
     user_id: UserID,
     target_product: ProductName,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     services_db_tables_injector: Callable,
     client: TestClient,
     benchmark,
@@ -89,7 +90,7 @@ async def test_list_services_without_details(
     rabbitmq_and_rpc_setup_disabled: None,
     user_id: int,
     target_product: ProductName,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     services_db_tables_injector: Callable,
     client: TestClient,
     benchmark,
@@ -133,7 +134,7 @@ async def test_list_services_without_details_with_wrong_user_id_returns_403(
     rabbitmq_and_rpc_setup_disabled: None,
     user_id: int,
     target_product: ProductName,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     services_db_tables_injector: Callable,
     client: TestClient,
 ):
@@ -166,7 +167,7 @@ async def test_list_services_without_details_with_another_product_returns_other_
     user_id: int,
     target_product: ProductName,
     other_product: ProductName,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     services_db_tables_injector: Callable,
     client: TestClient,
 ):
@@ -198,7 +199,7 @@ async def test_list_services_without_details_with_wrong_product_returns_0_servic
     rabbitmq_and_rpc_setup_disabled: None,
     user_id: int,
     target_product: ProductName,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     services_db_tables_injector: Callable,
     client: TestClient,
 ):
@@ -234,7 +235,7 @@ async def test_list_services_that_are_deprecated(
     mocked_director_rest_api_base: MockRouter,
     user_id: int,
     target_product: ProductName,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     services_db_tables_injector: Callable,
     client: TestClient,
 ):

services/catalog/tests/unit/with_dbs/test_api_rest_services_access_rights.py

@@ -15,6 +15,7 @@
 )
 from models_library.products import ProductName
 from pydantic import TypeAdapter
+from pytest_simcore.helpers.catalog_services import CreateFakeServiceDataCallable
 from respx.router import MockRouter
 from starlette.testclient import TestClient
 from yarl import URL
@@ -33,7 +34,7 @@ async def test_get_service_access_rights(
     rabbitmq_and_rpc_setup_disabled: None,
     user: dict[str, Any],
     target_product: ProductName,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     services_db_tables_injector: Callable,
     client: TestClient,
 ):
@@ -80,7 +81,7 @@ async def test_get_service_access_rights_with_more_gids(
     rabbitmq_and_rpc_setup_disabled: None,
     user: dict[str, Any],
     other_product: ProductName,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     services_db_tables_injector: Callable,
     user_groups_ids: list[int],
     client: TestClient,

services/catalog/tests/unit/with_dbs/test_api_rest_services_specifications.py

@@ -183,7 +183,7 @@ async def test_get_service_specifications(
     user: dict[str, Any],
     user_groups_ids: list[int],
     target_product: ProductName,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     services_db_tables_injector: Callable,
     services_specifications_injector: Callable,
     sqlalchemy_async_engine: AsyncEngine,
@@ -278,7 +278,7 @@ async def test_get_service_specifications_are_passed_to_newer_versions_of_servic
     user: dict[str, Any],
     user_groups_ids: list[int],
     target_product: ProductName,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     services_db_tables_injector: Callable,
     services_specifications_injector: Callable,
     create_service_specifications: Callable[..., ServiceSpecificationsAtDB],

services/catalog/tests/unit/with_dbs/test_api_rpc.py

@@ -26,6 +26,7 @@
 from models_library.users import UserID
 from packaging import version
 from pydantic import ValidationError
+from pytest_simcore.helpers.catalog_services import CreateFakeServiceDataCallable
 from pytest_simcore.helpers.faker_factories import random_icon_url
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
@@ -70,7 +71,7 @@ def num_versions_per_service() -> int:
 @pytest.fixture
 def fake_data_for_services(
     target_product: ProductName,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     num_services: int,
     num_versions_per_service: int,
 ) -> list:
@@ -169,7 +170,7 @@ async def test_rpc_list_services_paginated_with_filter_combinations(
     product_name: ProductName,
     user_id: UserID,
     app: FastAPI,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     services_db_tables_injector: Callable,
 ):
     """Tests all combinations of filters for list_services_paginated"""
@@ -565,7 +566,7 @@ async def test_rpc_batch_get_my_services(
     user: dict[str, Any],
     user_id: UserID,
     app: FastAPI,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     services_db_tables_injector: Callable,
 ):
     # Create fake services data
@@ -645,7 +646,7 @@ async def test_rpc_list_my_service_history_paginated(
     product_name: ProductName,
     user_id: UserID,
     app: FastAPI,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     services_db_tables_injector: Callable,
 ):
     assert app
@@ -775,7 +776,7 @@ async def test_rpc_get_service_ports_permission_denied(
     user_id: UserID,
     other_user: dict[str, Any],
     app: FastAPI,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     services_db_tables_injector: Callable,
 ):
     """Tests that appropriate error is raised when user doesn't have permission"""

services/catalog/tests/unit/with_dbs/test_service_access_rights.py

@@ -11,6 +11,7 @@
 from models_library.services import ServiceMetaDataPublished, ServiceVersion
 from pydantic import TypeAdapter
 from pytest_mock import MockerFixture
+from pytest_simcore.helpers.catalog_services import CreateFakeServiceDataCallable
 from simcore_service_catalog.models.services_db import ServiceAccessRightsDB
 from simcore_service_catalog.repository.services import ServicesRepository
 from simcore_service_catalog.service.access_rights import (
@@ -89,7 +90,7 @@ async def test_auto_upgrade_policy(
     target_product: ProductName,
     other_product: ProductName,
     services_db_tables_injector: Callable,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     mocker: MockerFixture,
 ):
     everyone_gid, user_gid, team_gid = user_groups_ids
@@ -122,6 +123,17 @@ async def test_auto_upgrade_policy(
     new_service_metadata.version = TypeAdapter(ServiceVersion).validate_python("1.0.11")
     new_service_metadata.icon = None  # Remove icon to test inheritance
 
+    latest_release_service, *latest_release_service_access_rights = (
+        create_fake_service_data(
+            new_service_metadata.key,
+            "1.0.10",
+            team_access="x",
+            everyone_access=None,
+            product=target_product,
+        )
+    )
+    latest_release_service["icon"] = "https://foo/previous_icon.svg"
+
     # we have three versions of the service in the database for which the sorting matters: (1.0.11 should inherit from 1.0.10 not 1.0.9)
     await services_db_tables_injector(
         [
@@ -141,23 +153,10 @@ async def test_auto_upgrade_policy(
             ),
             # new release is a patch on released 1.0.X
             # which were released in two different product
-            create_fake_service_data(
-                new_service_metadata.key,
-                "1.0.10",
-                team_access="x",
-                everyone_access=None,
-                product=target_product,
-                icon="previous_icon.svg",
-            ),
-            create_fake_service_data(
-                new_service_metadata.key,
-                "1.0.10",
-                team_access="x",
-                everyone_access=None,
-                product=other_product,
-            ),
+            (latest_release_service, *latest_release_service_access_rights),
         ]
     )
+
     # ------------
 
     app = FastAPI()
@@ -201,7 +200,7 @@ async def test_auto_upgrade_policy(
     # Check metadata inheritance
     inherited_metadata = inherited_data["metadata_updates"]
     assert "icon" in inherited_metadata
-    assert inherited_metadata["icon"] == "previous_icon.svg"
+    assert inherited_metadata["icon"] == latest_release_service["icon"]
 
     # ALL
     service_access_rights += inherited_access_rights

services/catalog/tests/unit/with_dbs/test_service_catalog_services.py

@@ -54,7 +54,7 @@ def num_versions_per_service() -> int:
 @pytest.fixture
 def fake_services_data(
     target_product: ProductName,
-    create_fake_service_data: Callable,
+    create_fake_service_data: CreateFakeServiceDataCallable,
     num_services: int,
     num_versions_per_service: int,
 ) -> list: