Fix formatting, import sorting, and lint issues in tests

Signed-off-by: Mathias L. Baumann <mathias.baumann@frequenz.com>

Author: Marenz

tests/test_client.py

@@ -27,8 +27,8 @@
     MarketLocationRef,
     MarketLocationSample,
     MarketLocationSeries,
-    MarketLocationUpdate,
     MarketLocationsFilter,
+    MarketLocationUpdate,
     MetricType,
     MetricUnit,
     PaginationParams,
@@ -46,8 +46,10 @@ def _make_client() -> MarketMeteringApiClient:
         connect=False,
     )
     # Inject a mock stub so we don't need a real connection.
+    # pylint: disable=protected-access
     client._stub = MagicMock()  # noqa: SLF001
     client._channel = MagicMock()  # noqa: SLF001
+    # pylint: enable=protected-access
     return client
 
 
@@ -449,9 +451,9 @@ async def test_yields_parsed_series(self) -> None:
         response = pb.ReceiveMarketLocationSamplesStreamResponse(series=[series_pb])
 
         # Mock the streaming call to return an async iterator.
-        async def mock_stream() -> AsyncIterator[
-            pb.ReceiveMarketLocationSamplesStreamResponse
-        ]:
+        async def mock_stream() -> (
+            AsyncIterator[pb.ReceiveMarketLocationSamplesStreamResponse]
+        ):
             yield response
 
         client.stub.ReceiveMarketLocationSamplesStream = MagicMock(
@@ -477,9 +479,9 @@ async def test_sends_time_filter(self) -> None:
         """Test that start_time and end_time are sent."""
         client = _make_client()
 
-        async def mock_stream() -> AsyncIterator[
-            pb.ReceiveMarketLocationSamplesStreamResponse
-        ]:
+        async def mock_stream() -> (
+            AsyncIterator[pb.ReceiveMarketLocationSamplesStreamResponse]
+        ):
             return
             yield  # make it an async generator  # noqa: RET504
 
@@ -534,9 +536,9 @@ async def test_yields_parsed_results(self) -> None:
             error_code=pb.SAMPLE_UPSERT_ERROR_CODE_UNSPECIFIED,
         )
 
-        async def mock_stream() -> AsyncIterator[
-            pb.UpsertMarketLocationSamplesStreamResponse
-        ]:
+        async def mock_stream() -> (
+            AsyncIterator[pb.UpsertMarketLocationSamplesStreamResponse]
+        ):
             yield upsert_response
 
         client.stub.UpsertMarketLocationSamplesStream = MagicMock(
@@ -562,9 +564,9 @@ async def mock_stream() -> AsyncIterator[
             samples=[sample],
         )
 
-        async def input_stream() -> AsyncIterator[
-            tuple[MarketLocationRef, MarketLocationSeries]
-        ]:
+        async def input_stream() -> (
+            AsyncIterator[tuple[MarketLocationRef, MarketLocationSeries]]
+        ):
             yield (ml_ref, series)
 
         results = []

tests/test_integration.py

@@ -27,6 +27,8 @@
         uv run pytest -m integration
 """
 
+from collections.abc import AsyncIterator
+
 import grpc
 import pytest
 from grpc.aio import AioRpcError
@@ -51,7 +53,7 @@
 
 
 @pytest.fixture
-async def client():
+async def client() -> AsyncIterator[MarketMeteringApiClient]:
     """Create a connected client for testing."""
     c = MarketMeteringApiClient(
         server_url=SERVICE_URL,