From 8868028dcdc99b5272cb100f26367eb785b426ef Mon Sep 17 00:00:00 2001 From: Alexei Chetroi Date: Sun, 1 Nov 2020 11:05:55 -0500 Subject: [PATCH] Bump up ZHA dependencies (#42679) * Bump up ZHA dependencies * Fix tests because of zigpy request signature change --- homeassistant/components/zha/core/gateway.py | 2 +- homeassistant/components/zha/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- tests/components/zha/test_cover.py | 37 ++++++++++---------- tests/components/zha/test_discover.py | 1 + tests/components/zha/test_light.py | 13 ++++--- tests/components/zha/test_switch.py | 4 +-- 8 files changed, 33 insertions(+), 30 deletions(-) diff --git a/homeassistant/components/zha/core/gateway.py b/homeassistant/components/zha/core/gateway.py index bb57d7f03f4..bdfcf1b24f2 100644 --- a/homeassistant/components/zha/core/gateway.py +++ b/homeassistant/components/zha/core/gateway.py @@ -637,7 +637,7 @@ class ZHAGateway: _LOGGER.debug("Shutting down ZHA ControllerApplication") for unsubscribe in self._unsubs: unsubscribe() - await self.application_controller.shutdown() + await self.application_controller.pre_shutdown() @callback diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json index 01c24bdc6f6..be8619811d8 100644 --- a/homeassistant/components/zha/manifest.json +++ b/homeassistant/components/zha/manifest.json @@ -9,7 +9,7 @@ "zha-quirks==0.0.45", "zigpy-cc==0.5.2", "zigpy-deconz==0.11.0", - "zigpy==0.26.0", + "zigpy==0.27.0", "zigpy-xbee==0.13.0", "zigpy-zigate==0.6.2", "zigpy-znp==0.2.2" diff --git a/requirements_all.txt b/requirements_all.txt index 35364f142a8..1485734c624 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2359,7 +2359,7 @@ zigpy-zigate==0.6.2 zigpy-znp==0.2.2 # homeassistant.components.zha -zigpy==0.26.0 +zigpy==0.27.0 # homeassistant.components.zoneminder zm-py==0.4.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index d7620a33ced..78f3318b931 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1131,4 +1131,4 @@ zigpy-zigate==0.6.2 zigpy-znp==0.2.2 # homeassistant.components.zha -zigpy==0.26.0 +zigpy==0.27.0 diff --git a/tests/components/zha/test_cover.py b/tests/components/zha/test_cover.py index b295543b3e8..783637d26d7 100644 --- a/tests/components/zha/test_cover.py +++ b/tests/components/zha/test_cover.py @@ -32,7 +32,7 @@ from .common import ( send_attributes_report, ) -from tests.async_mock import AsyncMock, MagicMock, call, patch +from tests.async_mock import AsyncMock, MagicMock, patch from tests.common import async_capture_events, mock_coro, mock_restore_cache @@ -144,9 +144,10 @@ async def test_cover(m1, hass, zha_device_joined_restored, zigpy_cover_device): DOMAIN, SERVICE_CLOSE_COVER, {"entity_id": entity_id}, blocking=True ) assert cluster.request.call_count == 1 - assert cluster.request.call_args == call( - False, 0x1, (), expect_reply=True, manufacturer=None, tsn=None - ) + assert cluster.request.call_args[0][0] is False + assert cluster.request.call_args[0][1] == 0x01 + assert cluster.request.call_args[0][2] == () + assert cluster.request.call_args[1]["expect_reply"] is True # open from UI with patch( @@ -156,9 +157,10 @@ async def test_cover(m1, hass, zha_device_joined_restored, zigpy_cover_device): DOMAIN, SERVICE_OPEN_COVER, {"entity_id": entity_id}, blocking=True ) assert cluster.request.call_count == 1 - assert cluster.request.call_args == call( - False, 0x0, (), expect_reply=True, manufacturer=None, tsn=None - ) + assert cluster.request.call_args[0][0] is False + assert cluster.request.call_args[0][1] == 0x00 + assert cluster.request.call_args[0][2] == () + assert cluster.request.call_args[1]["expect_reply"] is True # set position UI with patch( @@ -171,15 +173,11 @@ async def test_cover(m1, hass, zha_device_joined_restored, zigpy_cover_device): blocking=True, ) assert cluster.request.call_count == 1 - assert cluster.request.call_args == call( - False, - 0x5, - (zigpy.types.uint8_t,), - 53, - expect_reply=True, - manufacturer=None, - tsn=None, - ) + assert cluster.request.call_args[0][0] is False + assert cluster.request.call_args[0][1] == 0x05 + assert cluster.request.call_args[0][2] == (zigpy.types.uint8_t,) + assert cluster.request.call_args[0][3] == 53 + assert cluster.request.call_args[1]["expect_reply"] is True # stop from UI with patch( @@ -189,9 +187,10 @@ async def test_cover(m1, hass, zha_device_joined_restored, zigpy_cover_device): DOMAIN, SERVICE_STOP_COVER, {"entity_id": entity_id}, blocking=True ) assert cluster.request.call_count == 1 - assert cluster.request.call_args == call( - False, 0x2, (), expect_reply=True, manufacturer=None, tsn=None - ) + assert cluster.request.call_args[0][0] is False + assert cluster.request.call_args[0][1] == 0x02 + assert cluster.request.call_args[0][2] == () + assert cluster.request.call_args[1]["expect_reply"] is True # test rejoin await async_test_rejoin(hass, zigpy_cover_device, [cluster], (1,)) diff --git a/tests/components/zha/test_discover.py b/tests/components/zha/test_discover.py index 5589a7d94ac..b5da98dc01f 100644 --- a/tests/components/zha/test_discover.py +++ b/tests/components/zha/test_discover.py @@ -113,6 +113,7 @@ async def test_devices( 0, expect_reply=True, manufacturer=None, + tries=1, tsn=None, ) diff --git a/tests/components/zha/test_light.py b/tests/components/zha/test_light.py index 642504384cc..ea1b8487b7c 100644 --- a/tests/components/zha/test_light.py +++ b/tests/components/zha/test_light.py @@ -323,7 +323,7 @@ async def async_test_on_off_from_hass(hass, cluster, entity_id): assert cluster.request.call_count == 1 assert cluster.request.await_count == 1 assert cluster.request.call_args == call( - False, ON, (), expect_reply=True, manufacturer=None, tsn=None + False, ON, (), expect_reply=True, manufacturer=None, tries=1, tsn=None ) await async_test_off_from_hass(hass, cluster, entity_id) @@ -340,7 +340,7 @@ async def async_test_off_from_hass(hass, cluster, entity_id): assert cluster.request.call_count == 1 assert cluster.request.await_count == 1 assert cluster.request.call_args == call( - False, OFF, (), expect_reply=True, manufacturer=None, tsn=None + False, OFF, (), expect_reply=True, manufacturer=None, tries=1, tsn=None ) @@ -360,7 +360,7 @@ async def async_test_level_on_off_from_hass( assert level_cluster.request.call_count == 0 assert level_cluster.request.await_count == 0 assert on_off_cluster.request.call_args == call( - False, ON, (), expect_reply=True, manufacturer=None, tsn=None + False, ON, (), expect_reply=True, manufacturer=None, tries=1, tsn=None ) on_off_cluster.request.reset_mock() level_cluster.request.reset_mock() @@ -373,7 +373,7 @@ async def async_test_level_on_off_from_hass( assert level_cluster.request.call_count == 1 assert level_cluster.request.await_count == 1 assert on_off_cluster.request.call_args == call( - False, ON, (), expect_reply=True, manufacturer=None, tsn=None + False, ON, (), expect_reply=True, manufacturer=None, tries=1, tsn=None ) assert level_cluster.request.call_args == call( False, @@ -383,6 +383,7 @@ async def async_test_level_on_off_from_hass( 100.0, expect_reply=True, manufacturer=None, + tries=1, tsn=None, ) on_off_cluster.request.reset_mock() @@ -396,7 +397,7 @@ async def async_test_level_on_off_from_hass( assert level_cluster.request.call_count == 1 assert level_cluster.request.await_count == 1 assert on_off_cluster.request.call_args == call( - False, ON, (), expect_reply=True, manufacturer=None, tsn=None + False, ON, (), expect_reply=True, manufacturer=None, tries=1, tsn=None ) assert level_cluster.request.call_args == call( False, @@ -406,6 +407,7 @@ async def async_test_level_on_off_from_hass( 1, expect_reply=True, manufacturer=None, + tries=1, tsn=None, ) on_off_cluster.request.reset_mock() @@ -445,6 +447,7 @@ async def async_test_flash_from_hass(hass, cluster, entity_id, flash): 0, expect_reply=True, manufacturer=None, + tries=1, tsn=None, ) diff --git a/tests/components/zha/test_switch.py b/tests/components/zha/test_switch.py index aab8dafef4f..80412d95fb7 100644 --- a/tests/components/zha/test_switch.py +++ b/tests/components/zha/test_switch.py @@ -136,7 +136,7 @@ async def test_switch(hass, zha_device_joined_restored, zigpy_device): ) assert len(cluster.request.mock_calls) == 1 assert cluster.request.call_args == call( - False, ON, (), expect_reply=True, manufacturer=None, tsn=None + False, ON, (), expect_reply=True, manufacturer=None, tries=1, tsn=None ) # turn off from HA @@ -150,7 +150,7 @@ async def test_switch(hass, zha_device_joined_restored, zigpy_device): ) assert len(cluster.request.mock_calls) == 1 assert cluster.request.call_args == call( - False, OFF, (), expect_reply=True, manufacturer=None, tsn=None + False, OFF, (), expect_reply=True, manufacturer=None, tries=1, tsn=None ) # test joining a new switch to the network and HA