evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix utility_meter reset when DST change occurs (#103012)

Browse source
This commit is contained in:
Diogo Gomes 2023-10-30 08:46:20 +00:00 • committed by GitHub
parent 71ecb39dc5
commit 7c94293cb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
homeassistant/components/utility_meter/sensor.py
View file

@ -534,16 +534,25 @@ class UtilityMeterSensor(RestoreSensor):
self.async_write_ha_state() self.async_write_ha_state()
async def _async_reset_meter(self, event): async def _program_reset(self):
"""Determine cycle - Helper function for larger than daily cycles.""" """Program the reset of the utility meter."""
if self._cron_pattern is not None: if self._cron_pattern is not None:
tz = dt_util.get_time_zone(self.hass.config.time_zone)
self.async_on_remove( self.async_on_remove(
async_track_point_in_time( async_track_point_in_time(
self.hass, self.hass,
self._async_reset_meter, self._async_reset_meter,
croniter(self._cron_pattern, dt_util.now()).get_next(datetime), croniter(self._cron_pattern, dt_util.now(tz)).get_next(
datetime
), # we need timezone for DST purposes (see issue #102984)
) )
) )
async def _async_reset_meter(self, event):
"""Reset the utility meter status."""
await self._program_reset()
await self.async_reset_meter(self._tariff_entity) await self.async_reset_meter(self._tariff_entity)
async def async_reset_meter(self, entity_id): async def async_reset_meter(self, entity_id):
@ -566,14 +575,7 @@ class UtilityMeterSensor(RestoreSensor):
"""Handle entity which will be added.""" """Handle entity which will be added."""
await super().async_added_to_hass() await super().async_added_to_hass()
if self._cron_pattern is not None: await self._program_reset()
self.async_on_remove(
async_track_point_in_time(
self.hass,
self._async_reset_meter,
croniter(self._cron_pattern, dt_util.now()).get_next(datetime),
)
)
self.async_on_remove( self.async_on_remove(
async_dispatcher_connect( async_dispatcher_connect(

14
tests/components/utility_meter/test_sensor.py
View file

@ -1266,7 +1266,9 @@ async def _test_self_reset(
state = hass.states.get("sensor.energy_bill") state = hass.states.get("sensor.energy_bill")
if expect_reset: if expect_reset:
assert state.attributes.get("last_period") == "2" assert state.attributes.get("last_period") == "2"
assert state.attributes.get("last_reset") == now.isoformat() assert (
state.attributes.get("last_reset") == dt_util.as_utc(now).isoformat()
) # last_reset is kept in UTC
assert state.state == "3" assert state.state == "3"
else: else:
assert state.attributes.get("last_period") == "0" assert state.attributes.get("last_period") == "0"
@ -1348,6 +1350,16 @@ async def test_self_reset_hourly(hass: HomeAssistant) -> None:
) )
async def test_self_reset_hourly_dst(hass: HomeAssistant) -> None:
"""Test hourly reset of meter in DST change conditions."""
hass.config.time_zone = "Europe/Lisbon"
dt_util.set_default_time_zone(dt_util.get_time_zone(hass.config.time_zone))
await _test_self_reset(
hass, gen_config("hourly"), "2023-10-29T01:59:00.000000+00:00"
)
async def test_self_reset_daily(hass: HomeAssistant) -> None: async def test_self_reset_daily(hass: HomeAssistant) -> None:
"""Test daily reset of meter.""" """Test daily reset of meter."""
await _test_self_reset( await _test_self_reset(