review fixes

Author: artur.shiriev

tests/bootstrappers/test_fastapi.py

@@ -1,8 +1,8 @@
 import typing
 from unittest.mock import MagicMock
 
+from fastapi import status
 from fastapi.testclient import TestClient
-from litestar import status_codes
 
 from microbootstrap.bootstrappers.fastapi import FastApiBootstrapper
 from microbootstrap.config.fastapi import FastApiConfig
@@ -22,7 +22,7 @@ def test_fastapi_configure_instrument() -> None:
     )
 
     response: typing.Final = TestClient(app=application).get(test_metrics_path)
-    assert response.status_code == status_codes.HTTP_200_OK
+    assert response.status_code == status.HTTP_200_OK
 
 
 def test_fastapi_configure_instruments() -> None:
@@ -36,7 +36,7 @@ def test_fastapi_configure_instruments() -> None:
     )
 
     response: typing.Final = TestClient(app=application).get(test_metrics_path)
-    assert response.status_code == status_codes.HTTP_200_OK
+    assert response.status_code == status.HTTP_200_OK
 
 
 def test_fastapi_configure_application() -> None:

tests/instruments/test_health_checks.py

@@ -2,9 +2,9 @@
 
 import fastapi
 import litestar
-from fastapi.testclient import TestClient
+from fastapi.testclient import TestClient as FastAPITestClient
 from litestar import status_codes
-from litestar.testing import AsyncTestClient
+from litestar.testing import TestClient as LitestarTestClient
 
 from microbootstrap.bootstrappers.fastapi import FastApiHealthChecksInstrument
 from microbootstrap.bootstrappers.litestar import LitestarHealthChecksInstrument
@@ -40,7 +40,7 @@ def test_health_checks_teardown(
     assert health_checks_instrument.teardown() is None  # type: ignore[func-returns-value]
 
 
-async def test_litestar_health_checks_bootstrap() -> None:
+def test_litestar_health_checks_bootstrap() -> None:
     test_health_checks_path: typing.Final = "/test-path/"
     heatlh_checks_config: typing.Final = HealthChecksConfig(health_checks_path=test_health_checks_path)
     health_checks_instrument: typing.Final = LitestarHealthChecksInstrument(heatlh_checks_config)
@@ -50,8 +50,8 @@ async def test_litestar_health_checks_bootstrap() -> None:
         **health_checks_instrument.bootstrap_before(),
     )
 
-    async with AsyncTestClient(app=litestar_application) as async_client:
-        response = await async_client.get(heatlh_checks_config.health_checks_path)
+    with LitestarTestClient(app=litestar_application) as async_client:
+        response = async_client.get(heatlh_checks_config.health_checks_path)
         assert response.status_code == status_codes.HTTP_200_OK
 
 
@@ -66,5 +66,5 @@ def test_fastapi_health_checks_bootstrap() -> None:
     )
     fastapi_application = health_checks_instrument.bootstrap_after(fastapi_application)
 
-    response = TestClient(app=fastapi_application).get(heatlh_checks_config.health_checks_path)
+    response = FastAPITestClient(app=fastapi_application).get(heatlh_checks_config.health_checks_path)
     assert response.status_code == status_codes.HTTP_200_OK

tests/instruments/test_logging.py

@@ -4,8 +4,8 @@
 
 import fastapi
 import litestar
-from fastapi.testclient import TestClient
-from litestar.testing import AsyncTestClient
+from fastapi.testclient import TestClient as FastAPITestClient
+from litestar.testing import TestClient as LitestarTestClient
 from opentelemetry import trace
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import ConsoleSpanExporter, SimpleSpanProcessor
@@ -51,7 +51,7 @@ def test_litestar_logging_bootstrap(minimal_logging_config: LoggingConfig) -> No
     assert len(bootsrap_result["middleware"]) == 1
 
 
-async def test_litestar_logging_bootstrap_working(minimal_logging_config: LoggingConfig) -> None:
+def test_litestar_logging_bootstrap_working(minimal_logging_config: LoggingConfig) -> None:
     logging_instrument: typing.Final = LitestarLoggingInstrument(minimal_logging_config)
 
     @litestar.get("/test-handler")
@@ -64,12 +64,12 @@ async def error_handler() -> str:
         **logging_instrument.bootstrap_before(),
     )
 
-    async with AsyncTestClient(app=litestar_application) as async_client:
-        await async_client.get("/test-handler?test-query=1")
-        await async_client.get("/test-handler")
+    with LitestarTestClient(app=litestar_application) as test_client:
+        test_client.get("/test-handler?test-query=1")
+        test_client.get("/test-handler")
 
 
-async def test_litestar_logging_bootstrap_tracer_injection(minimal_logging_config: LoggingConfig) -> None:
+def test_litestar_logging_bootstrap_tracer_injection(minimal_logging_config: LoggingConfig) -> None:
     trace.set_tracer_provider(TracerProvider())
     tracer = trace.get_tracer(__name__)
     span_processor = SimpleSpanProcessor(ConsoleSpanExporter())
@@ -89,8 +89,8 @@ async def test_handler() -> str:
         # Do some fake work inside the span
         span.set_attribute("example_attribute", "value")
         span.add_event("example_event", {"event_attr": 1})
-        async with AsyncTestClient(app=litestar_application) as async_client:
-            await async_client.get("/test-handler")
+        with LitestarTestClient(app=litestar_application) as test_client:
+            test_client.get("/test-handler")
 
 
 def test_memory_logger_factory_info() -> None:
@@ -145,6 +145,6 @@ async def test_handler() -> str:
     logging_instrument.bootstrap()
     logging_instrument.bootstrap_after(fastapi_application)
 
-    with TestClient(app=fastapi_application) as test_client:
+    with FastAPITestClient(app=fastapi_application) as test_client:
         test_client.get("/test-handler?test-query=1")
         test_client.get("/test-handler")

tests/instruments/test_opentelemetry.py

@@ -5,9 +5,9 @@
 import fastapi
 import litestar
 import pytest
-from fastapi.testclient import TestClient
+from fastapi.testclient import TestClient as FastAPITestClient
 from litestar.middleware.base import DefineMiddleware
-from litestar.testing import AsyncTestClient
+from litestar.testing import TestClient as LitestarTestClient
 
 from microbootstrap import OpentelemetryConfig
 from microbootstrap.bootstrappers.fastapi import FastApiOpentelemetryInstrument
@@ -70,7 +70,7 @@ def test_litestar_opentelemetry_teardown(
     opentelemetry_instrument.teardown()
 
 
-async def test_litestar_opentelemetry_bootstrap_working(
+def test_litestar_opentelemetry_bootstrap_working(
     minimal_opentelemetry_config: OpentelemetryConfig,
     async_mock: AsyncMock,
 ) -> None:
@@ -91,10 +91,10 @@ async def test_handler() -> None:
         route_handlers=[test_handler],
         **opentelemetry_bootstrap_result,
     )
-    async with AsyncTestClient(app=litestar_application) as async_client:
-        # Silencing error, cause we are mocking middleware call, so ASGI scope remains unchanged.
+    with LitestarTestClient(app=litestar_application) as test_client:
+        # Silencing error, because we are mocking middleware call, so ASGI scope remains unchanged.
         with contextlib.suppress(AssertionError):
-            await async_client.get("/test-handler")
+            test_client.get("/test-handler")
         assert async_mock.called
 
 
@@ -112,5 +112,5 @@ async def test_handler() -> None:
         return None
 
     with patch("opentelemetry.trace.use_span") as mock_capture_event:
-        TestClient(app=fastapi_application).get("/test-handler")
+        FastAPITestClient(app=fastapi_application).get("/test-handler")
         assert mock_capture_event.called

tests/instruments/test_prometheus.py

@@ -2,10 +2,10 @@
 
 import fastapi
 import litestar
-from fastapi.testclient import TestClient
+from fastapi.testclient import TestClient as FastAPITestClient
 from litestar import status_codes
 from litestar.middleware.base import DefineMiddleware
-from litestar.testing import AsyncTestClient
+from litestar.testing import TestClient as LitestarTestClient
 
 from microbootstrap import FastApiPrometheusConfig, LitestarPrometheusConfig
 from microbootstrap.bootstrappers.fastapi import FastApiPrometheusInstrument
@@ -56,7 +56,7 @@ def test_litestar_prometheus_bootstrap(minimal_litestar_prometheus_config: Lites
     assert isinstance(prometheus_bootstrap_result["middleware"][0], DefineMiddleware)
 
 
-async def test_litestar_prometheus_bootstrap_working(
+def test_litestar_prometheus_bootstrap_working(
     minimal_litestar_prometheus_config: LitestarPrometheusConfig,
 ) -> None:
     minimal_litestar_prometheus_config.prometheus_metrics_path = "/custom-metrics-path"
@@ -67,8 +67,8 @@ async def test_litestar_prometheus_bootstrap_working(
         **prometheus_instrument.bootstrap_before(),
     )
 
-    async with AsyncTestClient(app=litestar_application) as async_client:
-        response: typing.Final = await async_client.get(minimal_litestar_prometheus_config.prometheus_metrics_path)
+    with LitestarTestClient(app=litestar_application) as test_client:
+        response: typing.Final = test_client.get(minimal_litestar_prometheus_config.prometheus_metrics_path)
         assert response.status_code == status_codes.HTTP_200_OK
         assert response.text
 
@@ -80,7 +80,7 @@ def test_fastapi_prometheus_bootstrap_working(minimal_fastapi_prometheus_config:
     fastapi_application = fastapi.FastAPI()
     fastapi_application = prometheus_instrument.bootstrap_after(fastapi_application)
 
-    response: typing.Final = TestClient(app=fastapi_application).get(
+    response: typing.Final = FastAPITestClient(app=fastapi_application).get(
         minimal_fastapi_prometheus_config.prometheus_metrics_path
     )
     assert response.status_code == status_codes.HTTP_200_OK

tests/instruments/test_sentry.py

@@ -4,8 +4,8 @@
 
 import fastapi
 import litestar
-from fastapi.testclient import TestClient
-from litestar.testing import AsyncTestClient
+from fastapi.testclient import TestClient as FastAPITestClient
+from litestar.testing import TestClient as LitestarTestClient
 
 from microbootstrap import SentryConfig
 from microbootstrap.bootstrappers.fastapi import FastApiSentryInstrument
@@ -45,7 +45,7 @@ def test_litestar_sentry_bootstrap(minimal_sentry_config: SentryConfig) -> None:
     assert sentry_instrument.bootstrap_before() == {}
 
 
-async def test_litestar_sentry_bootstrap_catch_exception(
+def test_litestar_sentry_bootstrap_catch_exception(
     minimal_sentry_config: SentryConfig,
 ) -> None:
     sentry_instrument: typing.Final = LitestarSentryInstrument(minimal_sentry_config)
@@ -57,8 +57,8 @@ async def error_handler() -> None:
     sentry_instrument.bootstrap()
     litestar_application: typing.Final = litestar.Litestar(route_handlers=[error_handler])
     with patch("sentry_sdk.Scope.capture_event") as mock_capture_event:
-        async with AsyncTestClient(app=litestar_application) as async_client:
-            await async_client.get("/test-error-handler")
+        with LitestarTestClient(app=litestar_application) as test_client:
+            test_client.get("/test-error-handler")
 
         assert mock_capture_event.called
 
@@ -82,5 +82,5 @@ async def error_handler() -> None:
     sentry_instrument.bootstrap()
     with patch("sentry_sdk.Scope.capture_event") as mock_capture_event:
         with contextlib.suppress(ValueError):
-            TestClient(app=app).get("/test-error-handler")
+            FastAPITestClient(app=app).get("/test-error-handler")
         assert mock_capture_event.called

tests/instruments/test_swagger.py

@@ -2,12 +2,12 @@
 
 import fastapi
 import litestar
-from fastapi.testclient import TestClient
+from fastapi.testclient import TestClient as FastAPITestClient
 from litestar import openapi, status_codes
 from litestar.openapi import spec as litestar_openapi
 from litestar.openapi.plugins import ScalarRenderPlugin
 from litestar.static_files import StaticFilesConfig
-from litestar.testing import AsyncTestClient
+from litestar.testing import TestClient as LitestarTestClient
 
 from microbootstrap.bootstrappers.fastapi import FastApiSwaggerInstrument
 from microbootstrap.bootstrappers.litestar import LitestarSwaggerInstrument
@@ -97,7 +97,7 @@ def test_litestar_swagger_bootstrap_offline_docs(minimal_swagger_config: Swagger
     assert isinstance(bootstrap_result["static_files_config"][0], StaticFilesConfig)
 
 
-async def test_litestar_swagger_bootstrap_working_online_docs(
+def test_litestar_swagger_bootstrap_working_online_docs(
     minimal_swagger_config: SwaggerConfig,
 ) -> None:
     minimal_swagger_config.swagger_path = "/my-docs-path"
@@ -108,12 +108,12 @@ async def test_litestar_swagger_bootstrap_working_online_docs(
         **swagger_instrument.bootstrap_before(),
     )
 
-    async with AsyncTestClient(app=litestar_application) as async_client:
-        response: typing.Final = await async_client.get(minimal_swagger_config.swagger_path)
+    with LitestarTestClient(app=litestar_application) as test_client:
+        response: typing.Final = test_client.get(minimal_swagger_config.swagger_path)
         assert response.status_code == status_codes.HTTP_200_OK
 
 
-async def test_litestar_swagger_bootstrap_working_offline_docs(
+def test_litestar_swagger_bootstrap_working_offline_docs(
     minimal_swagger_config: SwaggerConfig,
 ) -> None:
     minimal_swagger_config.service_static_path = "/my-static-path"
@@ -125,10 +125,10 @@ async def test_litestar_swagger_bootstrap_working_offline_docs(
         **swagger_instrument.bootstrap_before(),
     )
 
-    async with AsyncTestClient(app=litestar_application) as async_client:
-        response = await async_client.get(minimal_swagger_config.swagger_path)
+    with LitestarTestClient(app=litestar_application) as test_client:
+        response = test_client.get(minimal_swagger_config.swagger_path)
         assert response.status_code == status_codes.HTTP_200_OK
-        response = await async_client.get(f"{minimal_swagger_config.service_static_path}/swagger-ui.css")
+        response = test_client.get(f"{minimal_swagger_config.service_static_path}/swagger-ui.css")
         assert response.status_code == status_codes.HTTP_200_OK
 
 
@@ -152,7 +152,7 @@ def test_fastapi_swagger_bootstrap_working_online_docs(
         **swagger_instrument.bootstrap_before(),
     )
 
-    response: typing.Final = TestClient(app=fastapi_application).get(minimal_swagger_config.swagger_path)
+    response: typing.Final = FastAPITestClient(app=fastapi_application).get(minimal_swagger_config.swagger_path)
     assert response.status_code == status_codes.HTTP_200_OK
 
 
@@ -167,7 +167,7 @@ def test_fastapi_swagger_bootstrap_working_offline_docs(
     )
     swagger_instrument.bootstrap_after(fastapi_application)
 
-    with TestClient(app=fastapi_application) as test_client:
+    with FastAPITestClient(app=fastapi_application) as test_client:
         response = test_client.get(minimal_swagger_config.swagger_path)
         assert response.status_code == status_codes.HTTP_200_OK
         response = test_client.get(f"{minimal_swagger_config.service_static_path}/swagger-ui.css")