Update PowerDistributor tests to not use the wait flag anymore

And instead sleep for the same amount of time, before sending requests
to the power distributor.

This sleep is needed only in the direct tests of the PowerDistributor.

In the `*_pool_control_methods` tests, PowerDistributor receives
requests from the PowerManager, which would happen only when there are
data, so additional sleep is not required in those tests.

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

Author: shsms

tests/actor/power_distributing/test_power_distributing.py

@@ -112,7 +112,6 @@ async def test_constructor_with_grid_meter(self, mocker: MockerFixture) -> None:
                 requests_receiver=requests_channel.new_receiver(),
                 results_sender=results_channel.new_sender(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
-                wait_for_data_sec=0.0,
             ) as distributor:
                 assert isinstance(distributor._component_manager, BatteryManager)
                 assert distributor._component_manager._bat_invs_map == {
@@ -144,7 +143,6 @@ async def test_constructor_without_grid_meter(self, mocker: MockerFixture) -> No
                 requests_receiver=requests_channel.new_receiver(),
                 results_sender=results_channel.new_sender(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
-                wait_for_data_sec=0.0,
             ) as distributor:
                 assert isinstance(distributor._component_manager, BatteryManager)
                 assert distributor._component_manager._bat_invs_map == {
@@ -210,8 +208,9 @@ async def test_power_distributor_one_user(self, mocker: MockerFixture) -> None:
             requests_receiver=requests_channel.new_receiver(),
             results_sender=results_channel.new_sender(),
             component_pool_status_sender=battery_status_channel.new_sender(),
-            wait_for_data_sec=0.1,
         ):
+            await asyncio.sleep(0.1)  # wait for actor to collect data
+
             await requests_channel.new_sender().send(request)
             result_rx = results_channel.new_receiver()
 
@@ -271,8 +270,9 @@ async def test_power_distributor_exclusion_bounds(
                 requests_receiver=requests_channel.new_receiver(),
                 results_sender=results_channel.new_sender(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
+                await asyncio.sleep(0.1)  # wait for actor to collect data
+
                 # zero power requests should pass through despite the exclusion bounds.
                 request = Request(
                     power=Power.zero(),
@@ -374,8 +374,9 @@ async def test_two_batteries_one_inverters(self, mocker: MockerFixture) -> None:
                 requests_receiver=requests_channel.new_receiver(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
                 results_sender=results_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
+                await asyncio.sleep(0.1)  # wait for actor to collect data
+
                 await requests_channel.new_sender().send(request)
                 result_rx = results_channel.new_receiver()
 
@@ -454,7 +455,6 @@ async def test_two_batteries_one_broken_one_inverters(
                 requests_receiver=requests_channel.new_receiver(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
                 results_sender=results_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
                 await requests_channel.new_sender().send(request)
                 result_rx = results_channel.new_receiver()
@@ -510,8 +510,9 @@ async def test_battery_two_inverters(self, mocker: MockerFixture) -> None:
                 requests_receiver=requests_channel.new_receiver(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
                 results_sender=results_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
+                await asyncio.sleep(0.1)  # wait for actor to collect data
+
                 await requests_channel.new_sender().send(request)
                 result_rx = results_channel.new_receiver()
 
@@ -562,8 +563,9 @@ async def test_two_batteries_three_inverters(self, mocker: MockerFixture) -> Non
                 requests_receiver=requests_channel.new_receiver(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
                 results_sender=results_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
+                await asyncio.sleep(0.1)  # wait for actor to collect data
+
                 await requests_channel.new_sender().send(request)
                 result_rx = results_channel.new_receiver()
 
@@ -648,8 +650,9 @@ async def test_two_batteries_one_inverter_different_exclusion_bounds_2(
                 requests_receiver=requests_channel.new_receiver(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
                 results_sender=results_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
+                await asyncio.sleep(0.1)  # wait for actor to collect data
+
                 await requests_channel.new_sender().send(request)
                 result_rx = results_channel.new_receiver()
 
@@ -735,8 +738,9 @@ async def test_two_batteries_one_inverter_different_exclusion_bounds(
                 requests_receiver=requests_channel.new_receiver(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
                 results_sender=results_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
+                await asyncio.sleep(0.1)  # wait for actor to collect data
+
                 await requests_channel.new_sender().send(request)
                 result_rx = results_channel.new_receiver()
 
@@ -801,7 +805,6 @@ async def test_connected_but_not_requested_batteries(
                 requests_receiver=requests_channel.new_receiver(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
                 results_sender=results_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
                 await requests_channel.new_sender().send(request)
                 result_rx = results_channel.new_receiver()
@@ -859,8 +862,9 @@ async def test_battery_soc_nan(self, mocker: MockerFixture) -> None:
                 requests_receiver=requests_channel.new_receiver(),
                 results_sender=results_channel.new_sender(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
+                await asyncio.sleep(0.1)  # wait for actor to collect data
+
                 await requests_channel.new_sender().send(request)
                 result_rx = results_channel.new_receiver()
 
@@ -914,8 +918,9 @@ async def test_battery_capacity_nan(self, mocker: MockerFixture) -> None:
                 requests_receiver=requests_channel.new_receiver(),
                 results_sender=results_channel.new_sender(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
+                await asyncio.sleep(0.1)  # wait for actor to collect data
+
                 await requests_channel.new_sender().send(request)
                 result_rx = results_channel.new_receiver()
 
@@ -988,8 +993,9 @@ async def test_battery_power_bounds_nan(self, mocker: MockerFixture) -> None:
                 requests_receiver=requests_channel.new_receiver(),
                 results_sender=results_channel.new_sender(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
+                await asyncio.sleep(0.1)  # wait for actor to collect data
+
                 await requests_channel.new_sender().send(request)
                 result_rx = results_channel.new_receiver()
 
@@ -1034,7 +1040,6 @@ async def test_power_distributor_invalid_battery_id(
                 requests_receiver=requests_channel.new_receiver(),
                 results_sender=results_channel.new_sender(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
                 await requests_channel.new_sender().send(request)
                 result_rx = results_channel.new_receiver()
@@ -1079,8 +1084,9 @@ async def test_power_distributor_one_user_adjust_power_consume(
                 requests_receiver=requests_channel.new_receiver(),
                 results_sender=results_channel.new_sender(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
+                await asyncio.sleep(0.1)  # wait for actor to collect data
+
                 await requests_channel.new_sender().send(request)
                 result_rx = results_channel.new_receiver()
 
@@ -1126,8 +1132,9 @@ async def test_power_distributor_one_user_adjust_power_supply(
                 requests_receiver=requests_channel.new_receiver(),
                 results_sender=results_channel.new_sender(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
+                await asyncio.sleep(0.1)  # wait for actor to collect data
+
                 await requests_channel.new_sender().send(request)
                 result_rx = results_channel.new_receiver()
 
@@ -1173,8 +1180,9 @@ async def test_power_distributor_one_user_adjust_power_success(
                 requests_receiver=requests_channel.new_receiver(),
                 results_sender=results_channel.new_sender(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
+                await asyncio.sleep(0.1)  # wait for actor to collect data
+
                 await requests_channel.new_sender().send(request)
                 result_rx = results_channel.new_receiver()
 
@@ -1213,8 +1221,9 @@ async def test_not_all_batteries_are_working(self, mocker: MockerFixture) -> Non
                 requests_receiver=requests_channel.new_receiver(),
                 results_sender=results_channel.new_sender(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
+                await asyncio.sleep(0.1)  # wait for actor to collect data
+
                 request = Request(
                     power=Power.from_kilowatts(1.2),
                     component_ids=batteries,
@@ -1267,8 +1276,9 @@ async def test_partial_failure_result(self, mocker: MockerFixture) -> None:
                 requests_receiver=requests_channel.new_receiver(),
                 results_sender=results_channel.new_sender(),
                 component_pool_status_sender=battery_status_channel.new_sender(),
-                wait_for_data_sec=0.1,
             ):
+                await asyncio.sleep(0.1)  # wait for actor to collect data
+
                 request = Request(
                     power=Power.from_kilowatts(1.70),
                     component_ids=batteries,