fixup! Add tests for PVPool control methods

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

Author: shsms

tests/timeseries/_pv_pool/test_pv_pool_control_methods.py

@@ -21,7 +21,7 @@
 from frequenz.sdk.actor import ResamplerConfig, power_distributing
 from frequenz.sdk.microgrid._data_pipeline import _DataPipeline
 from frequenz.sdk.timeseries import Power
-from frequenz.sdk.timeseries.pv_pool import PVPool, PVPoolReport
+from frequenz.sdk.timeseries.pv_pool import PVPoolReport
 
 from ...microgrid.fixtures import _Mocks
 from ...utils.component_data_streamer import MockComponentDataStreamer
@@ -117,22 +117,6 @@ def _assert_report(  # pylint: disable=too-many-arguments
             assert report.distribution_result is not None
             assert expected_result_pred(report.distribution_result)
 
-    async def _get_bounds_receiver(self, pv_pool: PVPool) -> Receiver[PVPoolReport]:
-        bounds_rx = pv_pool.power_status.new_receiver()
-
-        # Consume initial reports as components are initialized
-        expected_lower_bounds = -100000.0
-        max_reports = 10
-        ctr = 0
-        while ctr < max_reports:
-            ctr += 1
-            report = await bounds_rx.receive()
-            assert report.bounds is not None
-            if report.bounds.lower == Power.from_watts(expected_lower_bounds):
-                break
-
-        return bounds_rx
-
     async def _recv_reports_until(
         self,
         bounds_rx: Receiver[PVPoolReport],
@@ -160,7 +144,11 @@ async def test_setting_power(
         await self._init_pv_inverters(mocks)
         await self._patch_data_pipeline(mocker)
         pv_pool = microgrid.pv_pool()
-        bounds_rx = await self._get_bounds_receiver(pv_pool)
+        bounds_rx = pv_pool.power_status.new_receiver()
+        await self._recv_reports_until(
+            bounds_rx,
+            lambda x: x.bounds is not None and x.bounds.lower.as_watts() == -100000.0,
+        )
         self._assert_report(
             await bounds_rx.receive(), power=None, lower=-100000.0, upper=0.0
         )
@@ -187,8 +175,11 @@ async def test_setting_power(
 
         set_power.reset_mock()
         await pv_pool.propose_power(Power.from_watts(-4000.0))
-        # ignore one report because it is not always immediately updated.
-        await bounds_rx.receive()
+        await self._recv_reports_until(
+            bounds_rx,
+            lambda x: x.target_power is not None
+            and x.target_power.as_watts() == -4000.0,
+        )
         self._assert_report(
             await bounds_rx.receive(), power=-4000.0, lower=-100000.0, upper=0.0
         )