fixing tests

Author: pcrespov

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

@@ -247,22 +247,27 @@ async def services_db_tables_injector(
 
     async def _inject_in_db(fake_catalog: list[tuple]):
         # [(service, ar1, ...), (service2, ar1, ...) ]
+        iter_services = (items[0] for items in fake_catalog)
+        iter_access_rights = itertools.chain(items[1:] for items in fake_catalog)
 
         async with sqlalchemy_async_engine.begin() as conn:
             # NOTE: The 'default' dialect with current database version settings does not support in-place multirow inserts
-            for service in [items[0] for items in fake_catalog]:
-                insert_meta = pg_insert(services_meta_data).values(**service)
-                upsert_meta = insert_meta.on_conflict_do_update(
-                    index_elements=[
-                        services_meta_data.c.key,
-                        services_meta_data.c.version,
-                    ],
-                    set_=service,
+            for service in iter_services:
+
+                insert_stmt = pg_insert(services_meta_data).values(**service)
+
+                update_stmt = insert_stmt.on_conflict_do_update(
+                    index_elements=["key", "version"],
+                    set_={
+                        column_name: insert_stmt.excluded[column_name]
+                        for column_name in service
+                        if column_name not in ("key", "version")
+                    },
                 )
-                await conn.execute(upsert_meta)
+                await conn.execute(update_stmt)
                 inserted_services.add((service["key"], service["version"]))
 
-            for access_rights in itertools.chain(items[1:] for items in fake_catalog):
+            for access_rights in iter_access_rights:
                 stmt_access = services_access_rights.insert().values(access_rights)
                 await conn.execute(stmt_access)
 

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

@@ -6,7 +6,7 @@
 
 import simcore_service_catalog.service.access_rights
 from fastapi import FastAPI
-from models_library.groups import GroupAtDB, GroupID
+from models_library.groups import GroupID
 from models_library.products import ProductName
 from models_library.services import ServiceMetaDataPublished, ServiceVersion
 from pydantic import TypeAdapter
@@ -102,18 +102,18 @@ async def test_auto_upgrade_policy(
         return_value=False,
     )
     # Avoids creating a users + user_to_group table
-    data = GroupAtDB.model_json_schema()["example"]
-    data["gid"] = everyone_gid
-    mocker.patch.object(
-        simcore_service_catalog.service.access_rights.GroupsRepository,
-        "get_everyone_group",
-        return_value=GroupAtDB.model_validate(data),
-    )
-    mocker.patch.object(
-        simcore_service_catalog.service.access_rights.GroupsRepository,
-        "get_user_gid_from_email",
-        return_value=user_gid,
-    )
+    # data = GroupAtDB.model_json_schema()["example"]
+    # data["gid"] = everyone_gid
+    # mocker.patch.object(
+    #     simcore_service_catalog.service.access_rights.GroupsRepository,
+    #     "get_everyone_group",
+    #     return_value=GroupAtDB.model_validate(data),
+    # )
+    # mocker.patch.object(
+    #     simcore_service_catalog.service.access_rights.GroupsRepository,
+    #     "get_user_gid_from_email",
+    #     return_value=user_gid,
+    # )
 
     # SETUP ---
     MOST_UPDATED_EXAMPLE = -1
@@ -144,7 +144,7 @@ async def test_auto_upgrade_policy(
             team_access="x",
             everyone_access=None,
             product=other_product,  # <-- different product
-        ),
+        )
     )
 
     latest_release_in_other_product = (