Clean up custom polling in ZHA device and light (#32653)
* cleanup timer handle when device is removed * separate unavailable times for mains vs battery * better name * remove light refresh handle when removing light * remove unused parallel updates * don't steal HA const for different purpose * don't flood network every hour for lights * update test to test both intervals * add test for light refresh interval * fix tests * update test * put parallel updates back for now... * fix async_schedule_update_ha_state usage * review comment * review comment * update test - review conversation * review comments * await count not call count * flip some state
This commit is contained in:
1 parent
99109d162b
commit
4248893007
13 files changed
+122
-41
No files matched your search
@@ -8,11 +8,12 @@ import pytest
|
||||
import zigpy.zcl.clusters.general as general
|
||||
|
||||
import homeassistant.components.zha.core.device as zha_core_device
|
||||
import homeassistant.core as ha
|
||||
import homeassistant.util.dt as dt_util
|
||||
|
||||
from .common import async_enable_traffic
|
||||
|
||||
from tests.common import async_fire_time_changed
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def zigpy_device(zigpy_device_mock):
|
||||
@@ -32,9 +33,28 @@ def zigpy_device(zigpy_device_mock):
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def device_with_basic_channel(zigpy_device):
|
||||
def zigpy_device_mains(zigpy_device_mock):
|
||||
"""Device tracker zigpy device."""
|
||||
|
||||
def _dev(with_basic_channel: bool = True):
|
||||
in_clusters = [general.OnOff.cluster_id]
|
||||
if with_basic_channel:
|
||||
in_clusters.append(general.Basic.cluster_id)
|
||||
|
||||
endpoints = {
|
||||
3: {"in_clusters": in_clusters, "out_clusters": [], "device_type": 0}
|
||||
}
|
||||
return zigpy_device_mock(
|
||||
endpoints, node_descriptor=b"\x02@\x84_\x11\x7fd\x00\x00,d\x00\x00"
|
||||
)
|
||||
|
||||
return _dev
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def device_with_basic_channel(zigpy_device_mains):
|
||||
"""Return a zha device with a basic channel present."""
|
||||
return zigpy_device(with_basic_channel=True)
|
||||
return zigpy_device_mains(with_basic_channel=True)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
@@ -45,8 +65,8 @@ def device_without_basic_channel(zigpy_device):
|
||||
|
||||
def _send_time_changed(hass, seconds):
|
||||
"""Send a time changed event."""
|
||||
now = dt_util.utcnow() + timedelta(seconds)
|
||||
hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: now})
|
||||
now = dt_util.utcnow() + timedelta(seconds=seconds)
|
||||
async_fire_time_changed(hass, now)
|
||||
|
||||
|
||||
@asynctest.patch(
|
||||
@@ -66,13 +86,13 @@ async def test_check_available_success(
|
||||
basic_ch.read_attributes.reset_mock()
|
||||
device_with_basic_channel.last_seen = None
|
||||
assert zha_device.available is True
|
||||
_send_time_changed(hass, 61)
|
||||
_send_time_changed(hass, zha_core_device._CONSIDER_UNAVAILABLE_MAINS + 2)
|
||||
await hass.async_block_till_done()
|
||||
assert zha_device.available is False
|
||||
assert basic_ch.read_attributes.await_count == 0
|
||||
|
||||
device_with_basic_channel.last_seen = (
|
||||
time.time() - zha_core_device._KEEP_ALIVE_INTERVAL - 2
|
||||
time.time() - zha_core_device._CONSIDER_UNAVAILABLE_MAINS - 2
|
||||
)
|
||||
_seens = [time.time(), device_with_basic_channel.last_seen]
|
||||
|
||||
@@ -121,7 +141,7 @@ async def test_check_available_unsuccessful(
|
||||
assert basic_ch.read_attributes.await_count == 0
|
||||
|
||||
device_with_basic_channel.last_seen = (
|
||||
time.time() - zha_core_device._KEEP_ALIVE_INTERVAL - 2
|
||||
time.time() - zha_core_device._CONSIDER_UNAVAILABLE_MAINS - 2
|
||||
)
|
||||
|
||||
# unsuccessfuly ping zigpy device, but zha_device is still available
|
||||
@@ -162,7 +182,7 @@ async def test_check_available_no_basic_channel(
|
||||
assert zha_device.available is True
|
||||
|
||||
device_without_basic_channel.last_seen = (
|
||||
time.time() - zha_core_device._KEEP_ALIVE_INTERVAL - 2
|
||||
time.time() - zha_core_device._CONSIDER_UNAVAILABLE_BATTERY - 2
|
||||
)
|
||||
|
||||
assert "does not have a mandatory basic cluster" not in caplog.text
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
"""Test zha light."""
|
||||
from unittest.mock import call, sentinel
|
||||
from datetime import timedelta
|
||||
from unittest.mock import MagicMock, call, sentinel
|
||||
|
||||
import asynctest
|
||||
import pytest
|
||||
@@ -12,6 +13,7 @@ import zigpy.zcl.foundation as zcl_f
|
||||
from homeassistant.components.light import DOMAIN, FLASH_LONG, FLASH_SHORT
|
||||
from homeassistant.components.zha.light import FLASH_EFFECTS
|
||||
from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE
|
||||
import homeassistant.util.dt as dt_util
|
||||
|
||||
from .common import (
|
||||
async_enable_traffic,
|
||||
@@ -21,6 +23,8 @@ from .common import (
|
||||
make_zcl_header,
|
||||
)
|
||||
|
||||
from tests.common import async_fire_time_changed
|
||||
|
||||
ON = 1
|
||||
OFF = 0
|
||||
|
||||
@@ -63,6 +67,46 @@ LIGHT_COLOR = {
|
||||
}
|
||||
|
||||
|
||||
@asynctest.mock.patch(
|
||||
"zigpy.zcl.clusters.general.OnOff.read_attributes", new=MagicMock()
|
||||
)
|
||||
async def test_light_refresh(hass, zigpy_device_mock, zha_device_joined_restored):
|
||||
"""Test zha light platform refresh."""
|
||||
|
||||
# create zigpy devices
|
||||
zigpy_device = zigpy_device_mock(LIGHT_ON_OFF)
|
||||
zha_device = await zha_device_joined_restored(zigpy_device)
|
||||
on_off_cluster = zigpy_device.endpoints[1].on_off
|
||||
entity_id = await find_entity_id(DOMAIN, zha_device, hass)
|
||||
|
||||
# allow traffic to flow through the gateway and device
|
||||
await async_enable_traffic(hass, [zha_device])
|
||||
on_off_cluster.read_attributes.reset_mock()
|
||||
|
||||
# not enough time passed
|
||||
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=20))
|
||||
await hass.async_block_till_done()
|
||||
assert on_off_cluster.read_attributes.call_count == 0
|
||||
assert on_off_cluster.read_attributes.await_count == 0
|
||||
assert hass.states.get(entity_id).state == STATE_OFF
|
||||
|
||||
# 1 interval - 1 call
|
||||
on_off_cluster.read_attributes.return_value = [{"on_off": 1}, {}]
|
||||
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=80))
|
||||
await hass.async_block_till_done()
|
||||
assert on_off_cluster.read_attributes.call_count == 1
|
||||
assert on_off_cluster.read_attributes.await_count == 1
|
||||
assert hass.states.get(entity_id).state == STATE_ON
|
||||
|
||||
# 2 intervals - 2 calls
|
||||
on_off_cluster.read_attributes.return_value = [{"on_off": 0}, {}]
|
||||
async_fire_time_changed(hass, dt_util.utcnow() + timedelta(minutes=80))
|
||||
await hass.async_block_till_done()
|
||||
assert on_off_cluster.read_attributes.call_count == 2
|
||||
assert on_off_cluster.read_attributes.await_count == 2
|
||||
assert hass.states.get(entity_id).state == STATE_OFF
|
||||
|
||||
|
||||
@asynctest.patch(
|
||||
"zigpy.zcl.clusters.lighting.Color.request",
|
||||
new=asynctest.CoroutineMock(return_value=[sentinel.data, zcl_f.Status.SUCCESS]),
|
||||
@@ -84,7 +128,7 @@ LIGHT_COLOR = {
|
||||
[(LIGHT_ON_OFF, (1, 0, 0)), (LIGHT_LEVEL, (1, 1, 0)), (LIGHT_COLOR, (1, 1, 3))],
|
||||
)
|
||||
async def test_light(
|
||||
hass, zigpy_device_mock, zha_device_joined_restored, device, reporting,
|
||||
hass, zigpy_device_mock, zha_device_joined_restored, device, reporting
|
||||
):
|
||||
"""Test zha light platform."""
|
||||
|
||||
|
||||
Reference in new issue
Block a user