moving isolated tests

Author: pcrespov

services/web/server/tests/unit/isolated/products/conftest.py

@@ -0,0 +1,41 @@
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+# pylint: disable=too-many-arguments
+
+
+import json
+import re
+from typing import Any
+
+import pytest
+from faker import Faker
+from models_library.products import ProductName
+from pytest_simcore.helpers.faker_factories import random_product
+from simcore_postgres_database.models.products import products as products_table
+from simcore_service_webserver.constants import FRONTEND_APP_DEFAULT
+from sqlalchemy import String
+from sqlalchemy.dialects import postgresql
+
+
+@pytest.fixture(scope="session")
+def product_name() -> ProductName:
+    return ProductName(FRONTEND_APP_DEFAULT)
+
+
+@pytest.fixture
+def fake_product_from_db(faker: Faker, product_name: ProductName) -> dict[str, Any]:
+    server_defaults = {}
+    for c in products_table.columns:
+        if c.server_default is not None:
+            if isinstance(c.type, String):
+                server_defaults[c.name] = c.server_default.arg
+            elif isinstance(c.type, postgresql.JSONB):
+                m = re.match(r"^'(.+)'::jsonb$", c.server_default.arg.text)
+                if m:
+                    server_defaults[c.name] = json.loads(m.group(1))
+    return random_product(
+        name=product_name,
+        fake=faker,
+        **server_defaults,
+    )

services/web/server/tests/unit/isolated/test_products_middlewares.py renamed to services/web/server/tests/unit/isolated/products/test_products_middlewares.py

@@ -23,7 +23,7 @@
 
 
 @pytest.fixture()
-def mock_postgres_product_table():
+def mock_postgres_product_table() -> list[dict[str, Any]]:
     # NOTE: try here your product's host_regex before adding them in the database!
     column_defaults: dict[str, Any] = {
         c.name: f"{c.server_default.arg}" for c in products.columns if c.server_default
@@ -60,11 +60,12 @@ def mock_postgres_product_table():
 
 
 @pytest.fixture
-def mock_app(mock_postgres_product_table: dict[str, Any]) -> web.Application:
+def mock_app(mock_postgres_product_table: list[dict[str, Any]]) -> web.Application:
     app = web.Application()
 
     app_products: dict[str, Product] = {
-        entry["name"]: Product(**entry) for entry in mock_postgres_product_table
+        product_from_db["name"]: Product.model_validate(product_from_db)
+        for product_from_db in mock_postgres_product_table
     }
     default_product_name = next(iter(app_products.keys()))
     _set_app_state(app, app_products, default_product_name)

services/web/server/tests/unit/isolated/test_products_model.py renamed to services/web/server/tests/unit/isolated/products/test_products_model.py

@@ -4,36 +4,23 @@
 # pylint: disable=too-many-arguments
 
 
-import json
 import re
 from itertools import chain
 from typing import Any
 
 import pytest
 import simcore_service_webserver.products
 import sqlalchemy as sa
-from faker import Faker
 from models_library.basic_regex import TWILIO_ALPHANUMERIC_SENDER_ID_RE
 from models_library.products import ProductName
 from pydantic import BaseModel, ValidationError
-from pytest_simcore.helpers.faker_factories import random_product
 from pytest_simcore.pydantic_models import (
     assert_validation_model,
     walk_model_examples_in_package,
 )
 from simcore_postgres_database.models.products import products as products_table
-from simcore_service_webserver.constants import (
-    FRONTEND_APP_DEFAULT,
-    FRONTEND_APPS_AVAILABLE,
-)
+from simcore_service_webserver.constants import FRONTEND_APPS_AVAILABLE
 from simcore_service_webserver.products.models import Product
-from sqlalchemy import String
-from sqlalchemy.dialects import postgresql
-
-
-@pytest.fixture(scope="session")
-def product_name() -> ProductName:
-    return ProductName(FRONTEND_APP_DEFAULT)
 
 
 @pytest.mark.parametrize(
@@ -118,24 +105,6 @@ def test_product_host_regex_with_spaces():
     assert product.support_email == "[email protected]"
 
 
-@pytest.fixture
-def fake_product_from_db(faker: Faker, product_name: ProductName) -> dict[str, Any]:
-    server_defaults = {}
-    for c in products_table.columns:
-        if c.server_default is not None:
-            if isinstance(c.type, String):
-                server_defaults[c.name] = c.server_default.arg
-            elif isinstance(c.type, postgresql.JSONB):
-                m = re.match(r"^'(.+)'::jsonb$", c.server_default.arg.text)
-                if m:
-                    server_defaults[c.name] = json.loads(m.group(1))
-    return random_product(
-        name=product_name,
-        fake=faker,
-        **server_defaults,
-    )
-
-
 def test_safe_load_empty_blanks_on_string_cols_from_db(
     fake_product_from_db: dict[str, Any]
 ):