🐛 Flaky tests improvements (#6292)

Co-authored-by: Andrei Neagu <[email protected]>

Author: GitHK

packages/models-library/src/models_library/api_schemas_webserver/product.py

@@ -88,7 +88,7 @@ class GenerateInvitation(InputSchema):
 
 class InvitationGenerated(OutputSchema):
     product_name: ProductName
-    issuer: LowerCaseEmailStr
+    issuer: str
     guest: LowerCaseEmailStr
     trial_account_days: PositiveInt | None = None
     extra_credits_in_usd: PositiveInt | None = None
@@ -100,7 +100,7 @@ class Config(OutputSchema.Config):
             "examples": [
                 {
                     "productName": "osparc",
-                    "issuer": "john.doe@email.com",
+                    "issuer": "john.doe",
                     "guest": "[email protected]",
                     "trialAccountDays": 7,
                     "extraCreditsInUsd": 30,

packages/models-library/src/models_library/invitations.py

@@ -39,7 +39,7 @@ class InvitationInputs(BaseModel):
     @classmethod
     def trim_long_issuers_to_max_length(cls, v):
         if v and isinstance(v, str):
-            return v[: _MAX_LEN - 1]
+            return v[:_MAX_LEN]
         return v
 
 

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

@@ -58,7 +58,7 @@ def random_user(
     data = {
         # NOTE: ensures user name is unique to avoid flaky tests
         "name": f"{fake.user_name()}_{fake.uuid4()}",
-        "email": fake.email().lower(),
+        "email": f"{fake.uuid4()}_{fake.email().lower()}",
         "password_hash": _DEFAULT_HASH,
         "status": UserStatus.ACTIVE,
     }

packages/service-library/tests/test_redis.py

@@ -21,6 +21,7 @@
     RedisClientsManager,
     RedisManagerDBConfig,
 )
+from servicelib.utils import limited_gather
 from settings_library.redis import RedisDatabase, RedisSettings
 from tenacity import (
     AsyncRetrying,
@@ -262,7 +263,9 @@ async def _inc_counter() -> None:
             ):
                 await counter.race_condition_increase(INCREASE_BY)
 
-    await asyncio.gather(*(_inc_counter() for _ in range(INCREASE_OPERATIONS)))
+    await limited_gather(
+        *(_inc_counter() for _ in range(INCREASE_OPERATIONS)), limit=15
+    )
     assert counter.value == INCREASE_BY * INCREASE_OPERATIONS
 
 

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/containers_extension.py

@@ -160,10 +160,9 @@ async def detach_container_from_network(
         container_instance = await docker.containers.get(container_id)
         container_inspect = await container_instance.show()
 
-        attached_network_ids: set[str] = {
-            x["NetworkID"]
-            for x in container_inspect["NetworkSettings"]["Networks"].values()
-        }
+        attached_network_ids: set[str] = set(
+            container_inspect["NetworkSettings"]["Networks"].keys()
+        )
 
         if item.network_id not in attached_network_ids:
             _logger.debug(
@@ -176,4 +175,4 @@ async def detach_container_from_network(
         # NOTE: A docker network is only visible on a docker node when it is
         # used by a container
         network = DockerNetwork(docker=docker, id_=item.network_id)
-        await network.disconnect({"Container": container_id})
+        await network.disconnect({"Container": container_id, "Force": True})

services/dynamic-sidecar/tests/unit/test_api_containers.py

@@ -710,7 +710,7 @@ async def test_attach_detach_container_to_network(
                 container = await docker.containers.get(container_name)
                 container_inspect = await container.show()
                 networks = container_inspect["NetworkSettings"]["Networks"]
-                assert network_id in networks
+                assert network_id not in networks
 
 
 @pytest.fixture

services/web/server/src/simcore_service_webserver/products/_invitations_handlers.py

@@ -60,7 +60,7 @@ async def generate_invitation(request: web.Request):
 
     invitation = InvitationGenerated(
         product_name=generated.product,
-        issuer=generated.issuer,  # type: ignore[arg-type]
+        issuer=generated.issuer,
         guest=generated.guest,  # type: ignore[arg-type]
         trial_account_days=generated.trial_account_days,
         extra_credits_in_usd=generated.extra_credits_in_usd,

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

@@ -147,7 +147,6 @@ def _generate(url, **kwargs):
             body["product"] = example["product"]
 
         fake_code = binascii.hexlify(json.dumps(body).encode()).decode()
-
         return CallbackResult(
             status=status.HTTP_200_OK,
             payload=jsonable_encoder(

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

@@ -15,6 +15,7 @@
     GenerateInvitation,
     InvitationGenerated,
 )
+from models_library.invitations import _MAX_LEN
 from pydantic import PositiveInt
 from pytest_simcore.aioresponses_mocker import AioResponsesMock
 from pytest_simcore.helpers.assert_checks import assert_status
@@ -99,7 +100,10 @@ async def test_product_owner_generates_invitation(
     assert not error
 
     got = InvitationGenerated.parse_obj(data)
-    expected = {"issuer": logged_user["email"], **request_model.dict(exclude_none=True)}
+    expected = {
+        "issuer": logged_user["email"][:_MAX_LEN],
+        **request_model.dict(exclude_none=True),
+    }
     assert got.dict(include=set(expected), by_alias=False) == expected
 
     product_base_url = f"{client.make_url('/')}"