Improve finalization of voltage streamer tests

Use the `MockMicrogrid` as a context manager so it gets automatically
finalized. Before no finalization was done in the tests, except for only
one.

This commit can be reviewed much more easily hiding differences in
spaces (with `diff -w`, or appending `?w=1` to the GitHub URL).

Signed-off-by: Leandro Lucarella <[email protected]>

Author: llucax

tests/timeseries/test_voltage_streamer.py

@@ -17,108 +17,102 @@
 
 async def test_voltage_1(mocker: MockerFixture) -> None:
     """Test the phase-to-neutral voltage with a grid side meter."""
-    mockgrid = MockMicrogrid(grid_meter=True)
+    mockgrid = MockMicrogrid(grid_meter=True, mocker=mocker)
     mockgrid.add_batteries(1, no_meter=True)
     mockgrid.add_batteries(1, no_meter=False)
-    await mockgrid.start(mocker)
 
-    voltage = microgrid.voltage()
-    voltage_recv = voltage.new_receiver()
+    async with mockgrid:
+        voltage = microgrid.voltage()
+        voltage_recv = voltage.new_receiver()
 
-    assert voltage._task is not None
-    # Wait for voltage requests to be sent, one request per phase.
-    await asyncio.sleep(0)
-    await asyncio.sleep(0)
-    await asyncio.sleep(0)
+        assert voltage._task is not None
+        # Wait for voltage requests to be sent, one request per phase.
+        await asyncio.sleep(0)
+        await asyncio.sleep(0)
+        await asyncio.sleep(0)
 
-    for count in range(10):
-        volt_delta = 1 if count % 2 == 0 else -1
-        volt_phases: list[float | None] = [
-            220.0 * volt_delta,
-            219.8 * volt_delta,
-            220.2 * volt_delta,
-        ]
+        for count in range(10):
+            volt_delta = 1 if count % 2 == 0 else -1
+            volt_phases: list[float | None] = [
+                220.0 * volt_delta,
+                219.8 * volt_delta,
+                220.2 * volt_delta,
+            ]
 
-        await mockgrid.mock_resampler.send_meter_voltage([volt_phases, volt_phases])
+            await mockgrid.mock_resampler.send_meter_voltage([volt_phases, volt_phases])
 
-        val = await voltage_recv.receive()
-        assert val is not None
-        assert val.value_p1 and val.value_p2 and val.value_p3
-        assert val.value_p1.as_volts() == volt_phases[0]
-        assert val.value_p2.as_volts() == volt_phases[1]
-        assert val.value_p3.as_volts() == volt_phases[2]
-
-    await mockgrid.cleanup()
+            val = await voltage_recv.receive()
+            assert val is not None
+            assert val.value_p1 and val.value_p2 and val.value_p3
+            assert val.value_p1.as_volts() == volt_phases[0]
+            assert val.value_p2.as_volts() == volt_phases[1]
+            assert val.value_p3.as_volts() == volt_phases[2]
 
 
 async def test_voltage_2(mocker: MockerFixture) -> None:
     """Test the phase-to-neutral voltage without a grid side meter."""
-    mockgrid = MockMicrogrid(grid_meter=False)
+    mockgrid = MockMicrogrid(grid_meter=False, mocker=mocker)
     mockgrid.add_batteries(1, no_meter=False)
     mockgrid.add_batteries(1, no_meter=True)
-    await mockgrid.start(mocker)
-
-    voltage = microgrid.voltage()
-    voltage_recv = voltage.new_receiver()
 
-    assert voltage._task is not None
-    # Wait for voltage requests to be sent, one request per phase.
-    await asyncio.sleep(0)
-    await asyncio.sleep(0)
-    await asyncio.sleep(0)
+    async with mockgrid:
+        voltage = microgrid.voltage()
+        voltage_recv = voltage.new_receiver()
 
-    for count in range(10):
-        volt_delta = 1 if count % 2 == 0 else -1
-        volt_phases: list[float | None] = [
-            220.0 * volt_delta,
-            219.8 * volt_delta,
-            220.2 * volt_delta,
-        ]
+        assert voltage._task is not None
+        # Wait for voltage requests to be sent, one request per phase.
+        await asyncio.sleep(0)
+        await asyncio.sleep(0)
+        await asyncio.sleep(0)
 
-        await mockgrid.mock_resampler.send_meter_voltage([volt_phases])
+        for count in range(10):
+            volt_delta = 1 if count % 2 == 0 else -1
+            volt_phases: list[float | None] = [
+                220.0 * volt_delta,
+                219.8 * volt_delta,
+                220.2 * volt_delta,
+            ]
 
-        val = await voltage_recv.receive()
-        assert val is not None
-        assert val.value_p1 and val.value_p2 and val.value_p3
-        assert val.value_p1.as_volts() == volt_phases[0]
-        assert val.value_p2.as_volts() == volt_phases[1]
-        assert val.value_p3.as_volts() == volt_phases[2]
+            await mockgrid.mock_resampler.send_meter_voltage([volt_phases])
 
-    await mockgrid.cleanup()
+            val = await voltage_recv.receive()
+            assert val is not None
+            assert val.value_p1 and val.value_p2 and val.value_p3
+            assert val.value_p1.as_volts() == volt_phases[0]
+            assert val.value_p2.as_volts() == volt_phases[1]
+            assert val.value_p3.as_volts() == volt_phases[2]
 
 
 async def test_voltage_3(mocker: MockerFixture) -> None:
     """Test the phase-to-neutral voltage with None values."""
-    mockgrid = MockMicrogrid(grid_meter=True)
+    mockgrid = MockMicrogrid(grid_meter=True, mocker=mocker)
     mockgrid.add_batteries(2, no_meter=False)
-    await mockgrid.start(mocker)
-
-    voltage = microgrid.voltage()
-    voltage_recv = voltage.new_receiver()
-
-    assert voltage._task is not None
-    # Wait for voltage requests to be sent, one request per phase.
-    await asyncio.sleep(0)
-    await asyncio.sleep(0)
-    await asyncio.sleep(0)
-
-    for count in range(10):
-        volt_delta = 1 if count % 2 == 0 else -1
-        volt_phases: list[float | None] = [
-            220.0 * volt_delta,
-            219.8 * volt_delta,
-            220.2 * volt_delta,
-        ]
-
-        await mockgrid.mock_resampler.send_meter_voltage(
-            [volt_phases, [None, None, None], [None, 219.8, 220.2]]
-        )
-
-        val = await voltage_recv.receive()
-        assert val is not None
-        assert val.value_p1 and val.value_p2 and val.value_p3
-        assert val.value_p1.as_volts() == volt_phases[0]
-        assert val.value_p2.as_volts() == volt_phases[1]
-        assert val.value_p3.as_volts() == volt_phases[2]
-
-    await mockgrid.cleanup()
+
+    async with mockgrid:
+        voltage = microgrid.voltage()
+        voltage_recv = voltage.new_receiver()
+
+        assert voltage._task is not None
+        # Wait for voltage requests to be sent, one request per phase.
+        await asyncio.sleep(0)
+        await asyncio.sleep(0)
+        await asyncio.sleep(0)
+
+        for count in range(10):
+            volt_delta = 1 if count % 2 == 0 else -1
+            volt_phases: list[float | None] = [
+                220.0 * volt_delta,
+                219.8 * volt_delta,
+                220.2 * volt_delta,
+            ]
+
+            await mockgrid.mock_resampler.send_meter_voltage(
+                [volt_phases, [None, None, None], [None, 219.8, 220.2]]
+            )
+
+            val = await voltage_recv.receive()
+            assert val is not None
+            assert val.value_p1 and val.value_p2 and val.value_p3
+            assert val.value_p1.as_volts() == volt_phases[0]
+            assert val.value_p2.as_volts() == volt_phases[1]
+            assert val.value_p3.as_volts() == volt_phases[2]