Skip to content

Add missing PV and EV components to datapipeline's stop method #1222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 20, 2025
Merged

Add missing PV and EV components to datapipeline's stop method #1222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f5dc6a
Add missing PV and EV components to datapipeline's `stop` method
shsms May 20, 2025
919a0f4
Cleanup after PV and EV charger tests finish
shsms May 20, 2025
f03e6d3
Wrap test cleanup calls in `finally` blocks
shsms May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/frequenz/sdk/microgrid/_data_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,14 @@ async def _stop(self) -> None:
if self._resampling_actor:
await self._resampling_actor.actor.stop()
await self._battery_power_wrapper.stop()
await self._ev_power_wrapper.stop()
await self._pv_power_wrapper.stop()
for pool in self._battery_pool_reference_stores.values():
await pool.stop()
for evpool in self._ev_charger_pool_reference_stores.values():
await evpool.stop()
for pvpool in self._pv_pool_reference_stores.values():
await pvpool.stop()


_DATA_PIPELINE: _DataPipeline | None = None
Expand Down
27 changes: 14 additions & 13 deletions tests/timeseries/_battery_pool/test_battery_pool_control_methods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,20 @@ async def mocks(mocker: MockerFixture) -> typing.AsyncIterator[Mocks]:
dp = microgrid._data_pipeline._DATA_PIPELINE
assert dp is not None

yield Mocks(
mockgrid,
streamer,
dp._battery_power_wrapper.status_channel.new_sender(),
)

await asyncio.gather(
*[
dp._stop(),
streamer.stop(),
mockgrid.cleanup(),
]
)
try:
yield Mocks(
mockgrid,
streamer,
dp._battery_power_wrapper.status_channel.new_sender(),
)
finally:
_ = await asyncio.gather(
*[
dp._stop(),
streamer.stop(),
mockgrid.cleanup(),
]
)


class TestBatteryPoolControl:
Expand Down
19 changes: 14 additions & 5 deletions tests/timeseries/_ev_charger_pool/test_ev_charger_pool_control_methods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,20 @@ async def mocks(mocker: MockerFixture) -> typing.AsyncIterator[_Mocks]:

dp = typing.cast(_DataPipeline, microgrid._data_pipeline._DATA_PIPELINE)

yield _Mocks(
mockgrid,
streamer,
dp._ev_power_wrapper.status_channel.new_sender(),
)
try:
yield _Mocks(
mockgrid,
streamer,
dp._ev_power_wrapper.status_channel.new_sender(),
)
finally:
_ = await asyncio.gather(
*[
dp._stop(),
streamer.stop(),
mockgrid.cleanup(),
]
)


class TestEVChargerPoolControl:
Expand Down
19 changes: 14 additions & 5 deletions tests/timeseries/_pv_pool/test_pv_pool_control_methods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,20 @@ async def mocks(mocker: MockerFixture) -> typing.AsyncIterator[_Mocks]:

dp = typing.cast(_DataPipeline, microgrid._data_pipeline._DATA_PIPELINE)

yield _Mocks(
mockgrid,
streamer,
dp._pv_power_wrapper.status_channel.new_sender(),
)
try:
yield _Mocks(
mockgrid,
streamer,
dp._pv_power_wrapper.status_channel.new_sender(),
)
finally:
_ = await asyncio.gather(
*[
dp._stop(),
streamer.stop(),
mockgrid.cleanup(),
]
)


class TestPVPoolControl:
Expand Down
Loading