✅ Fixes flaky tests/unit/isolated/test_tracing.py::test_middleware_restrictions_opentelemetry_is_second_middleware (#8593)

Author: pcrespov

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

@@ -5,6 +5,7 @@
 
 import logging
 import re
+from copy import deepcopy
 from pathlib import Path
 from typing import Any
 
@@ -86,12 +87,20 @@ def skip_if_no_external_envfile(external_envfile_dict: EnvVarsDict) -> None:
 
 
 @pytest.fixture(scope="session")
-def env_devel_dict(env_devel_file: Path) -> EnvVarsDict:
+def _env_devel_dict_session(env_devel_file: Path) -> EnvVarsDict:
     assert env_devel_file.exists()
     assert env_devel_file.name == ".env-devel"
+    # Loads and interpolates .env-devel file
     return load_dotenv(env_devel_file, verbose=True, interpolate=True)
 
 
+@pytest.fixture
+def env_devel_dict(_env_devel_dict_session: EnvVarsDict) -> EnvVarsDict:
+    # NOTE: Returns a copy of the session scoped env_devel_dict on every
+    # test run to avoid cross-test pollution.
+    return deepcopy(_env_devel_dict_session)
+
+
 @pytest.fixture
 def mock_env_devel_environment(
     env_devel_dict: EnvVarsDict, monkeypatch: pytest.MonkeyPatch

services/catalog/tests/unit/conftest.py

@@ -8,6 +8,7 @@
 
 import hashlib
 from collections.abc import AsyncIterator, Awaitable, Callable, Iterator
+from copy import deepcopy
 from pathlib import Path
 from typing import Any, NamedTuple
 
@@ -74,14 +75,14 @@ def package_dir() -> Path:
     return dirpath
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture
 def env_devel_dict(
     env_devel_dict: EnvVarsDict, external_envfile_dict: EnvVarsDict
 ) -> EnvVarsDict:
     if external_envfile_dict:
         assert "CATALOG_DEV_FEATURES_ENABLED" in external_envfile_dict
         assert "CATALOG_SERVICES_DEFAULT_RESOURCES" in external_envfile_dict
-        return external_envfile_dict
+        return deepcopy(external_envfile_dict)
     return env_devel_dict
 
 

services/efs-guardian/tests/conftest.py

@@ -5,6 +5,7 @@
 # pylint: disable=unused-variable
 
 
+from copy import deepcopy
 from pathlib import Path
 
 import pytest
@@ -52,12 +53,12 @@ def installed_package_dir() -> Path:
     return dirpath
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture
 def env_devel_dict(
     env_devel_dict: EnvVarsDict, external_envfile_dict: EnvVarsDict
 ) -> EnvVarsDict:
     if external_envfile_dict:
-        return external_envfile_dict
+        return deepcopy(external_envfile_dict)
     return env_devel_dict
 
 

services/efs-guardian/tests/unit/test_process_messages.py

@@ -60,7 +60,7 @@ async def test_process_msg(
         user_id=user_id,
         product_name=product_name,
     )
-    json_str = model_instance.json()
+    json_str = model_instance.model_dump_json()
     model_bytes = json_str.encode("utf-8")
 
     _expected_project_node_states = [".data_assets", "home_user_workspace"]
@@ -104,7 +104,7 @@ async def test_process_msg__dir_not_exists(
         user_id=user_id,
         product_name=product_name,
     )
-    json_str = model_instance.json()
+    json_str = model_instance.model_dump_json()
     model_bytes = json_str.encode("utf-8")
 
     result = await process_dynamic_service_running_message(app, data=model_bytes)

services/payments/tests/conftest.py

@@ -4,6 +4,7 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
+from copy import deepcopy
 from pathlib import Path
 
 import pytest
@@ -61,12 +62,12 @@ def external_envfile_dict(external_envfile_dict: EnvVarsDict) -> EnvVarsDict:
     return external_envfile_dict
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture
 def env_devel_dict(
     env_devel_dict: EnvVarsDict, external_envfile_dict: EnvVarsDict
 ) -> EnvVarsDict:
     if external_envfile_dict:
-        return external_envfile_dict
+        return deepcopy(external_envfile_dict)
     return env_devel_dict
 
 

services/web/server/tests/unit/isolated/test_tracing.py

@@ -18,6 +18,7 @@ def mock_webserver_service_environment(
     monkeypatch: pytest.MonkeyPatch, mock_webserver_service_environment: EnvVarsDict
 ) -> EnvVarsDict:
     monkeypatch.delenv("WEBSERVER_TRACING")
+
     return mock_webserver_service_environment | setenvs_from_dict(
         monkeypatch,
         {
@@ -27,7 +28,6 @@ def mock_webserver_service_environment(
     )
 
 
-@pytest.mark.skip(reason="Test fails almost always in CI pipelines")
 def test_middleware_restrictions_opentelemetry_is_second_middleware(
     mock_webserver_service_environment: EnvVarsDict,
 ):