Fix flaky LogicalMeter test_soc

In MockMicrogrid it is hardcoded that iverter with id > 100
send first 5 messages and then stop sending.
Tests assumed we have control over when the components
starts sending data and in what order.
But that is not true in async.
Also inverter messages were not synchronized with rest of the data.

Signed-off-by: ela-kotulska-frequenz <[email protected]>

Author: ela-kotulska-frequenz

tests/timeseries/mock_microgrid.py

@@ -75,6 +75,7 @@ def __init__(self, grid_side_meter: bool, sample_rate_s: float = 0.01):
         self.battery_ids: list[int] = []
         self.evc_ids: list[int] = []
         self.meter_ids: list[int] = [4]
+        self.bat_inv_map: dict[int, int] = {}
 
         self.evc_component_states: dict[int, EVChargerComponentState] = {}
         self.evc_cable_states: dict[int, EVChargerCableState] = {}
@@ -179,6 +180,7 @@ def add_batteries(self, count: int) -> None:
             self.meter_ids.append(meter_id)
             self.battery_inverter_ids.append(inv_id)
             self.battery_ids.append(bat_id)
+            self.bat_inv_map[bat_id] = inv_id
 
             self._components.add(
                 Component(

tests/timeseries/test_logical_meter.py

@@ -20,6 +20,8 @@
 )
 from .mock_microgrid import MockMicrogrid
 
+# pylint: disable=too-many-locals
+
 
 class TestLogicalMeter:
     """Tests for the logical meter."""
@@ -202,33 +204,48 @@ async def test_soc(self, mocker: MockerFixture) -> None:
 
         soc_recv = await logical_meter._soc()  # pylint: disable=protected-access
 
-        bat_receivers = [
-            await get_resampled_stream(
+        bat_receivers = {
+            bat_id: await get_resampled_stream(
                 logical_meter,
                 channel_registry,
                 request_chan.new_sender(),
                 bat_id,
                 ComponentMetricId.SOC,
             )
             for bat_id in mockgrid.battery_ids
-        ]
+        }
+
+        bat_inv_map = mockgrid.bat_inv_map
+        inv_receivers = {
+            inverter_id: await get_resampled_stream(
+                logical_meter,
+                channel_registry,
+                request_chan.new_sender(),
+                inverter_id,
+                ComponentMetricId.ACTIVE_POWER,
+            )
+            for inverter_id in mockgrid.bat_inv_map.values()
+        }
 
-        await synchronize_receivers([soc_recv, *bat_receivers])
+        await synchronize_receivers(
+            [soc_recv, *bat_receivers.values(), *inv_receivers.values()]
+        )
 
-        for ctr in range(10):
+        for _ in range(10):
             bat_vals = []
-            for recv in bat_receivers:
-                val = await recv.receive()
+            for bat_id, bat_recv in bat_receivers.items():
+                inv_id = bat_inv_map[bat_id]
+                inv_recv = inv_receivers[inv_id]
+                inv_msg = await inv_recv.receive()
+                # We won't use batteries where adjacent inverter is not sending active
+                # power.
+                if inv_msg.value is None:
+                    continue
+
+                val = await bat_recv.receive()
                 assert val is not None and val.value is not None
                 bat_vals.append(val.value)
 
-            assert len(bat_vals) == 3
-            # After 5 values, the inverter with component_id > 100 stops sending
-            # data. And the values from the last battery goes out of the calculation.
-            # So we drop it from out control value as well.
-            if ctr >= 5:
-                bat_vals = bat_vals[:2]
-
             soc_sample = await soc_recv.receive()
             assert soc_sample is not None and soc_sample.value is not None