Fix tests after previous commit

Signed-off-by: Elzbieta Kotulska <[email protected]>

Author: ela-kotulska-frequenz

tests/timeseries/_formula_engine/test_formula_composition.py

@@ -151,7 +151,7 @@ async def test_formula_composition_missing_pv(self, mocker: MockerFixture) -> No
     async def test_formula_composition_missing_bat(self, mocker: MockerFixture) -> None:
         """Test the composition of formulas with missing battery power data."""
         mockgrid = MockMicrogrid(grid_meter=False, mocker=mocker)
-        mockgrid.add_solar_inverters(2)
+        mockgrid.add_solar_inverters(2, no_meter=True)
 
         count = 0
         async with mockgrid, AsyncExitStack() as stack:

tests/timeseries/test_formula_formatter.py

@@ -134,5 +134,5 @@ async def test_higher_order_formula(self, mocker: MockerFixture) -> None:
             composed_formula = (grid.power - pv_pool.power).build("grid_minus_pv")
             assert (
                 str(composed_formula)
-                == "[grid-power](#36 + #7 + #47 + #17 + #57 + #27) - [pv-power](#48 + #58)"
+                == "[grid-power](#36 + #7 + #47 + #17 + #57 + #27) - [pv-power](#47 + #57)"
             )

tests/timeseries/test_logical_meter.py

@@ -48,7 +48,8 @@ async def test_pv_power(self, mocker: MockerFixture) -> None:
             stack.push_async_callback(pv_pool.stop)
             pv_power_receiver = pv_pool.power.new_receiver()
 
-            await mockgrid.mock_resampler.send_pv_inverter_power([-1.0, -2.0])
+            await mockgrid.mock_resampler.send_meter_power([-1.0, -2.0])
+            await mockgrid.mock_resampler.send_pv_inverter_power([-10.0, -20.0])
             assert (await pv_power_receiver.receive()).value == Power.from_watts(-3.0)
 
     async def test_pv_power_no_meter(self, mocker: MockerFixture) -> None: