droping old dependencies

Author: pcrespov

services/web/server/tests/unit/with_dbs/03/invitations/test_login_handlers_registration_invitations.py

@@ -113,7 +113,7 @@ def _extract_invitation_code_from_url(invitation_url: HttpUrl) -> str:
 @pytest.mark.acceptance_test()
 async def test_registration_to_different_product(
     mocker: MockerFixture,
-    all_products_names: list[ProductName],
+    app_products_names: list[ProductName],
     client: TestClient,
     guest_email: str,
     guest_password: str,
@@ -146,8 +146,8 @@ async def _register_account(invitation_url: HttpUrl, product_deployed: ProductNa
             headers={X_PRODUCT_NAME_HEADER: product_deployed},
         )
 
-    product_a = all_products_names[0]
-    product_b = all_products_names[1]
+    product_a = app_products_names[0]
+    product_b = app_products_names[1]
 
     # PO creates an two invitations for guest in product A and product B
     invitation_product_a = await generate_invitation(

services/web/server/tests/unit/with_dbs/04/products/test_products_rest.py

@@ -128,15 +128,15 @@ async def test_get_product(
     ],
 )
 async def test_get_current_product_ui(
-    all_products_names: list[ProductName],
+    app_products_names: list[ProductName],
     product_name: ProductName,
     logged_user: UserInfoDict,
     client: TestClient,
     user_role: UserRole,
     expected_status_code: int,
 ):
     assert logged_user["role"] == user_role.value
-    assert product_name in all_products_names
+    assert product_name in app_products_names
 
     # give access to user to this product
     assert client.app

services/web/server/tests/unit/with_dbs/conftest.py

@@ -1,15 +1,7 @@
-"""Configuration for unit testing with a postgress fixture
-
-- Unit testing of webserver app with a postgress service as fixture
-- Starts test session by running a postgres container as a fixture (see postgress_service)
-
-IMPORTANT: remember that these are still unit-tests!
-"""
-
-# nopycln: file
 # pylint: disable=redefined-outer-name
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
+# pylint: disable=too-many-arguments
 
 import asyncio
 import random
@@ -36,7 +28,6 @@
 from aiohttp import web
 from aiohttp.test_utils import TestClient, TestServer
 from aiopg.sa import create_engine
-from aiopg.sa.connection import SAConnection
 from faker import Faker
 from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
 from models_library.products import ProductName
@@ -716,7 +707,7 @@ async def with_permitted_override_services_specifications(
 
 
 @pytest.fixture
-async def all_products_names(
+async def app_products_names(
     asyncpg_engine: AsyncEngine,
 ) -> AsyncIterable[list[ProductName]]:
     async with asyncpg_engine.connect() as conn:
@@ -767,7 +758,7 @@ async def all_products_names(
 @pytest.fixture
 async def all_product_prices(
     asyncpg_engine: AsyncEngine,
-    all_products_names: list[ProductName],
+    app_products_names: list[ProductName],
     faker: Faker,
 ) -> dict[ProductName, Decimal | None]:
     """Initial list of prices for all products"""
@@ -783,7 +774,7 @@ async def all_product_prices(
     }
 
     result = {}
-    for product_name in all_products_names:
+    for product_name in app_products_names:
         usd_or_none = product_price.get(product_name)
         if usd_or_none is not None:
             async with asyncpg_engine.begin() as conn:
@@ -806,23 +797,23 @@ async def all_product_prices(
 @pytest.fixture
 async def latest_osparc_price(
     all_product_prices: dict[ProductName, Decimal],
-    _pre_connection: SAConnection,
+    asyncpg_engine: AsyncEngine,
 ) -> Decimal:
     """This inserts a new price for osparc in the history
     (i.e. the old price of osparc is still in the database)
     """
-
-    usd = await _pre_connection.scalar(
-        products_prices.insert()
-        .values(
-            product_name="osparc",
-            usd_per_credit=all_product_prices["osparc"] + 5,
-            comment="New price for osparc",
-            stripe_price_id="stripe-price-id",
-            stripe_tax_rate_id="stripe-tax-rate-id",
+    async with asyncpg_engine.begin() as conn:
+        usd = await conn.scalar(
+            products_prices.insert()
+            .values(
+                product_name="osparc",
+                usd_per_credit=all_product_prices["osparc"] + 5,
+                comment="New price for osparc",
+                stripe_price_id="stripe-price-id",
+                stripe_tax_rate_id="stripe-tax-rate-id",
+            )
+            .returning(products_prices.c.usd_per_credit)
         )
-        .returning(products_prices.c.usd_per_credit)
-    )
     assert usd is not None
     assert usd != all_product_prices["osparc"]
     return Decimal(usd)