fix fixture and test

Author: sanderegg

packages/postgres-database/tests/conftest.py

@@ -19,6 +19,7 @@
 from aiopg.sa.engine import Engine
 from aiopg.sa.result import ResultProxy, RowProxy
 from faker import Faker
+from models_library.products import ProductName
 from pytest_simcore.helpers import postgres_tools
 from pytest_simcore.helpers.faker_factories import (
     random_group,
@@ -38,6 +39,7 @@
     user_to_groups,
     users,
 )
+from sqlalchemy.engine.row import Row
 from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
 
 pytest_plugins = [
@@ -324,18 +326,26 @@ async def _creator(project_uuid: uuid.UUID) -> ProjectNode:
 
 
 @pytest.fixture
-def create_fake_product(
-    connection: aiopg.sa.connection.SAConnection,
-) -> Callable[..., Awaitable[RowProxy]]:
-    async def _creator(product_name: str) -> RowProxy:
-        result = await connection.execute(
-            sa.insert(products)
-            .values(name=product_name, host_regex=".*")
-            .returning(sa.literal_column("*"))
-        )
-        assert result
-        row = await result.first()
-        assert row
-        return row
+async def create_fake_product(
+    asyncpg_engine: AsyncEngine,
+) -> AsyncIterator[Callable[[ProductName], Awaitable[Row]]]:
+    created_product_names = set()
+
+    async def _creator(product_name: ProductName) -> Row:
+        async with asyncpg_engine.begin() as connection:
+            result = await connection.execute(
+                sa.insert(products)
+                .values(name=product_name, host_regex=".*")
+                .returning(sa.literal_column("*"))
+            )
+            assert result
+            row = result.one()
+            created_product_names.add(row.name)
+            return row
 
-    return _creator
+    yield _creator
+
+    async with asyncpg_engine.begin() as conn:
+        await conn.execute(
+            products.delete().where(products.c.name.in_(created_product_names))
+        )

packages/postgres-database/tests/test_utils_groups_extra_properties.py

@@ -11,6 +11,7 @@
 import sqlalchemy
 from aiopg.sa.result import RowProxy
 from faker import Faker
+from models_library.products import ProductName
 from simcore_postgres_database.models.groups import GroupType, groups, user_to_groups
 from simcore_postgres_database.models.groups_extra_properties import (
     groups_extra_properties,
@@ -21,6 +22,7 @@
     GroupExtraPropertiesRepo,
 )
 from sqlalchemy import literal_column
+from sqlalchemy.engine.row import Row
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 
@@ -84,7 +86,7 @@ async def test_get(
     connection: aiopg.sa.connection.SAConnection,
     registered_user: RowProxy,
     product_name: str,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[ProductName], Awaitable[Row]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
 ):
     with pytest.raises(GroupExtraPropertiesNotFoundError):
@@ -106,7 +108,7 @@ async def test_get_v2(
     asyncpg_engine: AsyncEngine,
     registered_user: RowProxy,
     product_name: str,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[ProductName], Awaitable[Row]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
 ):
     with pytest.raises(GroupExtraPropertiesNotFoundError):
@@ -157,7 +159,7 @@ async def test_get_aggregated_properties_for_user_returns_properties_in_expected
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[ProductName], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,
@@ -227,7 +229,7 @@ async def test_get_aggregated_properties_for_user_returns_properties_in_expected
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[ProductName], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,
@@ -274,7 +276,7 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[ProductName], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,
@@ -385,7 +387,7 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[ProductName], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,

packages/postgres-database/tests/test_utils_user_preferences.py

@@ -5,8 +5,6 @@
 from typing import Any
 
 import pytest
-from aiopg.sa.connection import AsyncConnection
-from aiopg.sa.result import RowProxy
 from faker import Faker
 from pytest_simcore.helpers.faker_factories import random_user
 from simcore_postgres_database.models.users import UserRole, users
@@ -15,6 +13,7 @@
     FrontendUserPreferencesRepo,
     UserServicesUserPreferencesRepo,
 )
+from sqlalchemy.engine.row import Row
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
 
 
@@ -29,7 +28,9 @@ def preference_two() -> str:
 
 
 @pytest.fixture
-async def product_name(create_fake_product: Callable[..., Awaitable[RowProxy]]) -> str:
+async def product_name(
+    create_fake_product: Callable[[ProductName], Awaitable[Row]],
+) -> str:
     product = await create_fake_product("fake-product")
     return product[0]
 
@@ -203,7 +204,7 @@ async def test__same_preference_name_product_name__different_users(
 
 async def test__same_user_preference_name__different_product_name(
     connection: AsyncConnection,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[ProductName], Awaitable[Row]],
     preference_repo: type[BasePreferencesRepo],
     preference_one: str,
     faker: Faker,