Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check if attributes are present in new_state before accessing them #71967

Merged
merged 4 commits into from May 25, 2022
Merged

Check if attributes are present in new_state before accessing them #71967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7eb9e75
Check if attributes are present in new_state before accessing them.
RoboMagus May 16, 2022
8c037f2
Early return if new state is None|Unknown|Unavailable
RoboMagus May 17, 2022
124e694
Removed whitespace at line endings. +black run
RoboMagus May 18, 2022
1af086a
Update test for coverage
RoboMagus May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions homeassistant/components/integration/sensor.py
View file
Open in desktop
Expand Up @@ -191,11 +191,16 @@ def calc_integration(event):
old_state = event.data.get("old_state")
new_state = event.data.get("new_state")

if new_state is None or new_state.state in (
STATE_UNKNOWN,
STATE_UNAVAILABLE,
):
return

# We may want to update our state before an early return,
# based on the source sensor's unit_of_measurement
# or device_class.
update_state = False

unit = new_state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
if unit is not None:
new_unit_of_measurement = self._unit_template.format(unit)
Expand All @@ -214,11 +219,9 @@ def calc_integration(event):
if update_state:
self.async_write_ha_state()

if (
old_state is None
or new_state is None
or old_state.state in (STATE_UNKNOWN, STATE_UNAVAILABLE)
or new_state.state in (STATE_UNKNOWN, STATE_UNAVAILABLE)
if old_state is None or old_state.state in (
STATE_UNKNOWN,
STATE_UNAVAILABLE,
):
return

Expand Down
10 changes: 10 additions & 0 deletions tests/components/integration/test_sensor.py
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@
ENERGY_WATT_HOUR,
POWER_KILO_WATT,
POWER_WATT,
STATE_UNAVAILABLE,
STATE_UNKNOWN,
TIME_SECONDS,
)
Expand Down Expand Up @@ -350,6 +351,15 @@ async def test_units(hass):
# they became valid
assert state.attributes.get("unit_of_measurement") == ENERGY_WATT_HOUR

# When source state goes to None / Unknown, expect an early exit without
# changes to the state or unit_of_measurement
hass.states.async_set(entity_id, STATE_UNAVAILABLE, None)
await hass.async_block_till_done()

new_state = hass.states.get("sensor.integration")
assert state == new_state
assert state.attributes.get("unit_of_measurement") == ENERGY_WATT_HOUR


async def test_device_class(hass):
"""Test integration sensor units using a power source."""
Expand Down