fixing tests fixtures

Author: pcrespov

packages/postgres-database/tests/test_models_groups.py

@@ -98,12 +98,9 @@ async def test_own_group(
     connection: SAConnection,
 ):
     user_id = await postgres_users.insert_user_and_secrets(connection)
-    result = await connection.execute(users.select().where(users.c.id == user_id))
-    user: RowProxy = await result.fetchone()
-    assert not user.primary_gid
 
     # now fetch the same user that shall have a primary group set by the db
-    result = await connection.execute(users.select().where(users.c.id == user.id))
+    result = await connection.execute(users.select().where(users.c.id == user_id))
     user: RowProxy = await result.fetchone()
     assert user.primary_gid
 

packages/pytest-simcore/src/pytest_simcore/helpers/postgres_users.py

@@ -1,27 +1,58 @@
-from common_library.async_tools import maybe_await
 from simcore_postgres_database.models.users import users
 from simcore_postgres_database.models.users_secrets import users_secrets
 
 from .faker_factories import random_user, random_user_secrets
 
+# from .postgres_tools import insert_and_get_row_lifespan
+
 
 async def insert_user_and_secrets(conn, **overrides) -> int:
-    password = overrides.pop("password")
+    password = overrides.pop("password", None)
     # user data
-    user_id = await maybe_await(
-        conn.scalar(
-            users.insert().values(**random_user(**overrides)).returning(users.c.id)
-        )
+    user_id = await conn.scalar(
+        users.insert().values(**random_user(**overrides)).returning(users.c.id)
     )
     assert user_id is not None
 
     # secrets
-    await maybe_await(
-        conn.execute(
-            users_secrets.insert()
-            .values(**random_user_secrets(user_id=user_id, password=password))
-            .returning(users.c.id)
+    await conn.execute(
+        users_secrets.insert().values(
+            **random_user_secrets(user_id=user_id, password=password)
         )
     )
 
     return user_id
+
+
+# async def insert_and_get_user_lifespan(sqlalchemy_async_engine: AsyncEngine, **overrides):
+
+#     password = overrides.pop("password")
+
+#     exit_stack =  contextlib.AsyncExitStack()
+
+#     exit_stack(
+
+#     insert_and_get_row_lifespan(  # pylint:disable=contextmanager-generator-missing-cleanup
+#         sqlalchemy_async_engine,
+#         table=users,
+#         values=random_user(**random_user(**overrides)),
+#         pk_col=users.c.id,
+#     )
+
+#     await maybe_await(
+#         conn.execute(
+#             users_secrets.insert()
+#             .values(**random_user_secrets(user_id=user_id, password=password))
+#             .returning(users.c.id)
+#         )
+#     )
+
+
+#     user = await exit_stack.enter_async_context(
+#         insert_and_get_row_lifespan(  # pylint:disable=contextmanager-generator-missing-cleanup
+#             sqlalchemy_async_engine,
+#             table=users_table,
+#             values=random_user(**data),
+#             pk_col=users_table.c.id,
+#         )
+#     )