brought fixture in

sanderegg · sanderegg · commit d6a3701fd2f9 · 2025-07-10T13:59:45.000+02:00
diff --git a/packages/aws-library/tests/conftest.py b/packages/aws-library/tests/conftest.py
@@ -14,6 +14,7 @@
     "pytest_simcore.aws_ssm_service",
     "pytest_simcore.environment_configs",
     "pytest_simcore.file_extra",
+    "pytest_simcore.logging",
     "pytest_simcore.pydantic_models",
     "pytest_simcore.pytest_global_environs",
     "pytest_simcore.repository_paths",
diff --git a/packages/celery-library/tests/conftest.py b/packages/celery-library/tests/conftest.py
@@ -26,6 +26,7 @@
     "pytest_simcore.docker_compose",
     "pytest_simcore.docker_swarm",
     "pytest_simcore.environment_configs",
+    "pytest_simcore.logging",
     "pytest_simcore.rabbit_service",
     "pytest_simcore.redis_service",
     "pytest_simcore.repository_paths",
diff --git a/packages/common-library/tests/conftest.py b/packages/common-library/tests/conftest.py
@@ -9,6 +9,7 @@
 import pytest
 
 pytest_plugins = [
+    "pytest_simcore.logging",
     "pytest_simcore.pydantic_models",
     "pytest_simcore.pytest_global_environs",
     "pytest_simcore.repository_paths",
diff --git a/packages/dask-task-models-library/tests/conftest.py b/packages/dask-task-models-library/tests/conftest.py
@@ -7,6 +7,7 @@
 import pytest
 
 pytest_plugins = [
+    "pytest_simcore.logging",
     "pytest_simcore.pydantic_models",
     "pytest_simcore.pytest_global_environs",
     "pytest_simcore.repository_paths",
diff --git a/packages/models-library/tests/conftest.py b/packages/models-library/tests/conftest.py
@@ -10,6 +10,7 @@
 
 pytest_plugins = [
     "pytest_simcore.faker_projects_data",
+    "pytest_simcore.logging",
     "pytest_simcore.pydantic_models",
     "pytest_simcore.pytest_global_environs",
     "pytest_simcore.repository_paths",
diff --git a/packages/notifications-library/tests/conftest.py b/packages/notifications-library/tests/conftest.py
@@ -29,6 +29,7 @@
     "pytest_simcore.faker_payments_data",
     "pytest_simcore.faker_products_data",
     "pytest_simcore.faker_users_data",
+    "pytest_simcore.logging",
     "pytest_simcore.postgres_service",
     "pytest_simcore.repository_paths",
 ]
@@ -72,7 +73,7 @@ def product_data(
     return ProductData(  # type: ignore
         product_name=product_name,
         display_name=product["display_name"],
-        vendor_display_inline=f"{vendor.get('name','')}, {vendor.get('address','')}",
+        vendor_display_inline=f"{vendor.get('name', '')}, {vendor.get('address', '')}",
         support_email=product["support_email"],
         homepage_url=vendor.get("url"),
         ui=product_ui,
diff --git a/packages/postgres-database/tests/conftest.py b/packages/postgres-database/tests/conftest.py
@@ -41,6 +41,7 @@
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine, create_async_engine
 
 pytest_plugins = [
+    "pytest_simcore.logging",
     "pytest_simcore.pytest_global_environs",
     "pytest_simcore.repository_paths",
 ]
diff --git a/packages/pytest-simcore/src/pytest_simcore/logging.py b/packages/pytest-simcore/src/pytest_simcore/logging.py
@@ -1,7 +1,7 @@
 # In conftest.py or test_logging_utils.py
 import logging
-from collections.abc import AsyncIterator
-from contextlib import asynccontextmanager
+from collections.abc import Iterator
+from contextlib import contextmanager
 from unittest.mock import patch
 
 import pytest
@@ -19,15 +19,15 @@ def preserve_caplog_for_async_logging(request):
     # Patch setup_async_loggers_lifespan to preserve caplog handlers
     original_setup = setup_async_loggers_lifespan
 
-    @asynccontextmanager
-    async def patched_setup_async_loggers_lifespan(**kwargs) -> AsyncIterator[None]:
+    @contextmanager
+    def patched_setup_async_loggers_lifespan(**kwargs) -> Iterator[None]:
         # Find caplog's handler in root logger
         root_logger = logging.getLogger()
         caplog_handlers = [
             h for h in root_logger.handlers if "LogCaptureHandler" in f"{type(h)}"
         ]
 
-        async with original_setup(**kwargs):
+        with original_setup(**kwargs):
             # After setup, restore caplog handlers alongside queue handler
             for handler in caplog_handlers:
                 if handler not in root_logger.handlers:
diff --git a/packages/settings-library/tests/conftest.py b/packages/settings-library/tests/conftest.py
@@ -18,6 +18,7 @@
 pytest_plugins = [
     "pytest_simcore.cli_runner",
     "pytest_simcore.environment_configs",
+    "pytest_simcore.logging",
     "pytest_simcore.pydantic_models",
     "pytest_simcore.pytest_global_environs",
     "pytest_simcore.repository_paths",
diff --git a/packages/simcore-sdk/tests/conftest.py b/packages/simcore-sdk/tests/conftest.py
@@ -28,6 +28,7 @@
     "pytest_simcore.docker_compose",
     "pytest_simcore.docker_swarm",
     "pytest_simcore.file_extra",
+    "pytest_simcore.logging",
     "pytest_simcore.minio_service",
     "pytest_simcore.postgres_service",
     "pytest_simcore.pytest_global_environs",
diff --git a/services/agent/tests/conftest.py b/services/agent/tests/conftest.py
@@ -16,6 +16,7 @@
     "pytest_simcore.aws_server",
     "pytest_simcore.docker_compose",
     "pytest_simcore.docker_swarm",
+    "pytest_simcore.logging",
     "pytest_simcore.rabbit_service",
     "pytest_simcore.repository_paths",
 ]
diff --git a/services/api-server/tests/conftest.py b/services/api-server/tests/conftest.py
@@ -25,6 +25,7 @@
     "pytest_simcore.faker_users_data",
     "pytest_simcore.httpbin_service",
     "pytest_simcore.httpx_calls_capture",
+    "pytest_simcore.logging",
     "pytest_simcore.pydantic_models",
     "pytest_simcore.pytest_global_environs",
     "pytest_simcore.rabbit_service",
diff --git a/services/autoscaling/tests/unit/conftest.py b/services/autoscaling/tests/unit/conftest.py
@@ -110,6 +110,7 @@
     "pytest_simcore.docker_compose",
     "pytest_simcore.docker_swarm",
     "pytest_simcore.environment_configs",
+    "pytest_simcore.logging",
     "pytest_simcore.rabbit_service",
     "pytest_simcore.repository_paths",
 ]
diff --git a/services/catalog/tests/unit/conftest.py b/services/catalog/tests/unit/conftest.py
@@ -44,6 +44,7 @@
     "pytest_simcore.environment_configs",
     "pytest_simcore.faker_products_data",
     "pytest_simcore.faker_users_data",
+    "pytest_simcore.logging",
     "pytest_simcore.postgres_service",
     "pytest_simcore.pydantic_models",
     "pytest_simcore.pytest_global_environs",
@@ -179,7 +180,6 @@ def client(
     assert spy_app.on_shutdown.call_count == 0
 
     with TestClient(app_under_test) as cli:
-
         assert spy_app.on_startup.call_count == 1
         assert spy_app.on_shutdown.call_count == 0
 
@@ -392,7 +392,6 @@ def mocked_director_rest_api_base(
         assert_all_called=False,
         assert_all_mocked=True,
     ) as respx_mock:
-
         # HEATHCHECK
         assert openapi["paths"].get("/")
         respx_mock.head("/", name="healthcheck").respond(
diff --git a/services/clusters-keeper/tests/unit/conftest.py b/services/clusters-keeper/tests/unit/conftest.py
@@ -48,6 +48,7 @@
     "pytest_simcore.docker_swarm",
     "pytest_simcore.environment_configs",
     "pytest_simcore.faker_users_data",
+    "pytest_simcore.logging",
     "pytest_simcore.rabbit_service",
     "pytest_simcore.repository_paths",
     "pytest_simcore.simcore_service_library_fixtures",
diff --git a/services/dask-sidecar/tests/unit/conftest.py b/services/dask-sidecar/tests/unit/conftest.py
@@ -42,6 +42,7 @@
     "pytest_simcore.docker_swarm",
     "pytest_simcore.environment_configs",
     "pytest_simcore.faker_users_data",
+    "pytest_simcore.logging",
     "pytest_simcore.rabbit_service",
     "pytest_simcore.repository_paths",
 ]
diff --git a/services/datcore-adapter/tests/unit/conftest.py b/services/datcore-adapter/tests/unit/conftest.py
@@ -28,6 +28,7 @@
     "pytest_simcore.asyncio_event_loops",
     "pytest_simcore.cli_runner",
     "pytest_simcore.environment_configs",
+    "pytest_simcore.logging",
     "pytest_simcore.repository_paths",
     "pytest_simcore.pytest_global_environs",
 ]
diff --git a/services/director-v2/tests/conftest.py b/services/director-v2/tests/conftest.py
@@ -47,6 +47,7 @@
     "pytest_simcore.faker_products_data",
     "pytest_simcore.faker_projects_data",
     "pytest_simcore.faker_users_data",
+    "pytest_simcore.logging",
     "pytest_simcore.minio_service",
     "pytest_simcore.postgres_service",
     "pytest_simcore.pydantic_models",
diff --git a/services/director/tests/unit/conftest.py b/services/director/tests/unit/conftest.py
@@ -28,6 +28,7 @@
     "pytest_simcore.environment_configs",
     "pytest_simcore.faker_projects_data",
     "pytest_simcore.faker_users_data",
+    "pytest_simcore.logging",
     "pytest_simcore.repository_paths",
     "pytest_simcore.simcore_service_library_fixtures",
 ]
diff --git a/services/docker-api-proxy/tests/integration/conftest.py b/services/docker-api-proxy/tests/integration/conftest.py
@@ -23,6 +23,7 @@
     "pytest_simcore.docker_api_proxy",
     "pytest_simcore.docker_compose",
     "pytest_simcore.docker_swarm",
+    "pytest_simcore.logging",
     "pytest_simcore.repository_paths",
     "pytest_simcore.simcore_services",
 ]
diff --git a/services/dynamic-scheduler/tests/conftest.py b/services/dynamic-scheduler/tests/conftest.py
@@ -28,6 +28,7 @@
     "pytest_simcore.environment_configs",
     "pytest_simcore.faker_projects_data",
     "pytest_simcore.faker_users_data",
+    "pytest_simcore.logging",
     "pytest_simcore.postgres_service",
     "pytest_simcore.rabbit_service",
     "pytest_simcore.redis_service",
diff --git a/services/dynamic-sidecar/tests/conftest.py b/services/dynamic-sidecar/tests/conftest.py
@@ -40,6 +40,7 @@
     "pytest_simcore.docker_registry",
     "pytest_simcore.docker_swarm",
     "pytest_simcore.faker_users_data",
+    "pytest_simcore.logging",
     "pytest_simcore.minio_service",
     "pytest_simcore.postgres_service",
     "pytest_simcore.pytest_global_environs",
diff --git a/services/dynamic-sidecar/tests/integration/conftest.py b/services/dynamic-sidecar/tests/integration/conftest.py
@@ -8,6 +8,7 @@
 
 pytest_plugins = [
     "pytest_simcore.asyncio_event_loops",
+    "pytest_simcore.logging",
     "pytest_simcore.postgres_service",
     "pytest_simcore.simcore_storage_service",
     "pytest_simcore.rabbit_service",
diff --git a/services/efs-guardian/tests/conftest.py b/services/efs-guardian/tests/conftest.py
@@ -24,6 +24,7 @@
     "pytest_simcore.faker_users_data",
     "pytest_simcore.faker_products_data",
     "pytest_simcore.faker_projects_data",
+    "pytest_simcore.logging",
     "pytest_simcore.pydantic_models",
     "pytest_simcore.pytest_global_environs",
     "pytest_simcore.rabbit_service",
diff --git a/services/invitations/tests/unit/conftest.py b/services/invitations/tests/unit/conftest.py
@@ -17,6 +17,7 @@
 
 pytest_plugins = [
     "pytest_simcore.asyncio_event_loops",
+    "pytest_simcore.logging",
     "pytest_simcore.cli_runner",
     "pytest_simcore.repository_paths",
 ]
diff --git a/services/migration/tests/conftest.py b/services/migration/tests/conftest.py
@@ -2,5 +2,6 @@
     "pytest_simcore.docker_compose",
     "pytest_simcore.docker_registry",
     "pytest_simcore.docker_swarm",
+    "pytest_simcore.logging",
     "pytest_simcore.repository_paths",
 ]
diff --git a/services/notifications/tests/conftest.py b/services/notifications/tests/conftest.py
@@ -13,6 +13,7 @@
     "pytest_simcore.docker_compose",
     "pytest_simcore.docker_swarm",
     "pytest_simcore.environment_configs",
+    "pytest_simcore.logging",
     "pytest_simcore.postgres_service",
     "pytest_simcore.rabbit_service",
     "pytest_simcore.repository_paths",
diff --git a/services/payments/tests/conftest.py b/services/payments/tests/conftest.py
@@ -24,6 +24,7 @@
     "pytest_simcore.faker_products_data",
     "pytest_simcore.faker_users_data",
     "pytest_simcore.httpbin_service",
+    "pytest_simcore.logging",
     "pytest_simcore.postgres_service",
     "pytest_simcore.socketio",
     "pytest_simcore.rabbit_service",
diff --git a/services/resource-usage-tracker/tests/unit/conftest.py b/services/resource-usage-tracker/tests/unit/conftest.py
@@ -35,6 +35,7 @@
     "pytest_simcore.environment_configs",
     "pytest_simcore.faker_projects_data",
     "pytest_simcore.faker_products_data",
+    "pytest_simcore.logging",
     "pytest_simcore.postgres_service",
     "pytest_simcore.pydantic_models",
     "pytest_simcore.pytest_global_environs",
diff --git a/services/storage/tests/conftest.py b/services/storage/tests/conftest.py
@@ -98,6 +98,7 @@
     "pytest_simcore.environment_configs",
     "pytest_simcore.file_extra",
     "pytest_simcore.httpbin_service",
+    "pytest_simcore.logging",
     "pytest_simcore.openapi_specs",
     "pytest_simcore.postgres_service",
     "pytest_simcore.pytest_global_environs",
diff --git a/services/web/server/tests/conftest.py b/services/web/server/tests/conftest.py
@@ -74,6 +74,7 @@
     "pytest_simcore.environment_configs",
     "pytest_simcore.faker_users_data",
     "pytest_simcore.hypothesis_type_strategies",
+    "pytest_simcore.logging",
     "pytest_simcore.openapi_specs",
     "pytest_simcore.postgres_service",
     "pytest_simcore.pydantic_models",

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@`
`41`	`41`	`from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine, create_async_engine`
`42`	`42`
`43`	`43`	`pytest_plugins = [`
	`44`	`+ "pytest_simcore.logging",`
`44`	`45`	`"pytest_simcore.pytest_global_environs",`
`45`	`46`	`"pytest_simcore.repository_paths",`
`46`	`47`	`]`