Wrap test cleanup calls in finally blocks

Signed-off-by: Sahas Subramanian <[email protected]>

Author: shsms

tests/timeseries/_battery_pool/test_battery_pool_control_methods.py

@@ -71,19 +71,20 @@ async def mocks(mocker: MockerFixture) -> typing.AsyncIterator[Mocks]:
     dp = microgrid._data_pipeline._DATA_PIPELINE
     assert dp is not None
 
-    yield Mocks(
-        mockgrid,
-        streamer,
-        dp._battery_power_wrapper.status_channel.new_sender(),
-    )
-
-    await asyncio.gather(
-        *[
-            dp._stop(),
-            streamer.stop(),
-            mockgrid.cleanup(),
-        ]
-    )
+    try:
+        yield Mocks(
+            mockgrid,
+            streamer,
+            dp._battery_power_wrapper.status_channel.new_sender(),
+        )
+    finally:
+        _ = await asyncio.gather(
+            *[
+                dp._stop(),
+                streamer.stop(),
+                mockgrid.cleanup(),
+            ]
+        )
 
 
 class TestBatteryPoolControl:

tests/timeseries/_ev_charger_pool/test_ev_charger_pool_control_methods.py

@@ -57,19 +57,20 @@ async def mocks(mocker: MockerFixture) -> typing.AsyncIterator[_Mocks]:
 
     dp = typing.cast(_DataPipeline, microgrid._data_pipeline._DATA_PIPELINE)
 
-    yield _Mocks(
-        mockgrid,
-        streamer,
-        dp._ev_power_wrapper.status_channel.new_sender(),
-    )
-
-    await asyncio.gather(
-        *[
-            dp._stop(),
-            streamer.stop(),
-            mockgrid.cleanup(),
-        ]
-    )
+    try:
+        yield _Mocks(
+            mockgrid,
+            streamer,
+            dp._ev_power_wrapper.status_channel.new_sender(),
+        )
+    finally:
+        _ = await asyncio.gather(
+            *[
+                dp._stop(),
+                streamer.stop(),
+                mockgrid.cleanup(),
+            ]
+        )
 
 
 class TestEVChargerPoolControl:

tests/timeseries/_pv_pool/test_pv_pool_control_methods.py

@@ -50,19 +50,20 @@ async def mocks(mocker: MockerFixture) -> typing.AsyncIterator[_Mocks]:
 
     dp = typing.cast(_DataPipeline, microgrid._data_pipeline._DATA_PIPELINE)
 
-    yield _Mocks(
-        mockgrid,
-        streamer,
-        dp._pv_power_wrapper.status_channel.new_sender(),
-    )
-
-    await asyncio.gather(
-        *[
-            dp._stop(),
-            streamer.stop(),
-            mockgrid.cleanup(),
-        ]
-    )
+    try:
+        yield _Mocks(
+            mockgrid,
+            streamer,
+            dp._pv_power_wrapper.status_channel.new_sender(),
+        )
+    finally:
+        _ = await asyncio.gather(
+            *[
+                dp._stop(),
+                streamer.stop(),
+                mockgrid.cleanup(),
+            ]
+        )
 
 
 class TestPVPoolControl: