common

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/faker_users_data.py

@@ -129,6 +129,7 @@ def user(
     user_name: IDStr,
     user_password: str,
 ) -> dict[str, Any]:
+    """NOTE: it returns user data including poassword and password_hash"""
     secrets = random_user_secrets(fake=faker, user_id=user_id, password=user_password)
     assert secrets["user_id"] == user_id
     return {

packages/simcore-sdk/tests/integration/conftest.py

@@ -19,6 +19,7 @@
 from models_library.users import UserID
 from pydantic import TypeAdapter
 from pytest_simcore.helpers.faker_factories import random_project, random_user
+from pytest_simcore.helpers.postgres_tools import sync_insert_and_get_row_lifespan
 from settings_library.aws_s3_cli import AwsS3CliSettings
 from settings_library.r_clone import RCloneSettings, S3Provider
 from settings_library.s3 import S3Settings
@@ -40,18 +41,16 @@ def user_id(postgres_db: sa.engine.Engine) -> Iterable[UserID]:
     # which would turn this test too complex.
 
     # pylint: disable=no-value-for-parameter
-    with postgres_db.connect() as conn:
-        result = conn.execute(
-            users.insert().values(**random_user(name="test")).returning(users.c.id)
-        )
-        row = result.first()
-        assert row
-        usr_id = row[users.c.id]
-
-    yield usr_id
-
-    with postgres_db.connect() as conn:
-        conn.execute(users.delete().where(users.c.id == usr_id))
+    with sync_insert_and_get_row_lifespan(  # pylint:disable=contextmanager-generator-missing-cleanup
+        postgres_db,
+        table=users,
+        values=random_user(
+            name="test",
+        ),
+        pk_col=users.c.id,
+    ) as user_row:
+
+        yield user_row["id"]
 
 
 @pytest.fixture

services/dynamic-sidecar/tests/integration/conftest.py

@@ -4,6 +4,7 @@
 import sqlalchemy as sa
 from models_library.users import UserID
 from pytest_simcore.helpers.faker_factories import random_user
+from pytest_simcore.helpers.postgres_tools import sync_insert_and_get_row_lifespan
 from simcore_postgres_database.models.users import users
 
 pytest_plugins = [
@@ -24,15 +25,13 @@ def user_id(postgres_db: sa.engine.Engine) -> Iterable[UserID]:
     # which would turn this test too complex.
 
     # pylint: disable=no-value-for-parameter
-    stmt = users.insert().values(**random_user(name="test")).returning(users.c.id)
-    print(f"{stmt}")
-    with postgres_db.connect() as conn:
-        result = conn.execute(stmt)
-        row = result.first()
-        assert row
-        usr_id = row[users.c.id]
-
-    yield usr_id
-
-    with postgres_db.connect() as conn:
-        conn.execute(users.delete().where(users.c.id == usr_id))
+    with sync_insert_and_get_row_lifespan(  # pylint:disable=contextmanager-generator-missing-cleanup
+        postgres_db,
+        table=users,
+        values=random_user(
+            name="test",
+        ),
+        pk_col=users.c.id,
+    ) as user_row:
+
+        yield user_row["id"]