jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-24 21:57:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump up ZHA dependencies. (#32609)

Browse Source 
* Bump up ZHA dependencies.

* Update tests to match library changes.
This commit is contained in:
Alexei Chetroi 2020-03-09 12:39:41 -04:00 committed by GitHub
parent 988b400a9c
commit 743833e5f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/zha/manifest.json
View File

@ -4,12 +4,12 @@
"config_flow": true, "config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/zha", "documentation": "https://www.home-assistant.io/integrations/zha",
"requirements": [ "requirements": [
"bellows-homeassistant==0.13.2", "bellows-homeassistant==0.14.0",
"zha-quirks==0.0.35", "zha-quirks==0.0.36",
"zigpy-cc==0.1.0", "zigpy-cc==0.1.0",
"zigpy-deconz==0.7.0", "zigpy-deconz==0.7.0",
"zigpy-homeassistant==0.15.0", "zigpy-homeassistant==0.16.0",
"zigpy-xbee-homeassistant==0.9.0", "zigpy-xbee-homeassistant==0.10.0",
"zigpy-zigate==0.5.1" "zigpy-zigate==0.5.1"
], ],
"dependencies": [], "dependencies": [],

8
requirements_all.txt
View File

@ -309,7 +309,7 @@ beautifulsoup4==4.8.2
beewi_smartclim==0.0.7 beewi_smartclim==0.0.7
# homeassistant.components.zha # homeassistant.components.zha
bellows-homeassistant==0.13.2 bellows-homeassistant==0.14.0
# homeassistant.components.bmw_connected_drive # homeassistant.components.bmw_connected_drive
bimmer_connected==0.7.1 bimmer_connected==0.7.1
@ -2152,7 +2152,7 @@ zengge==0.2
zeroconf==0.24.5 zeroconf==0.24.5
# homeassistant.components.zha # homeassistant.components.zha
zha-quirks==0.0.35 zha-quirks==0.0.36
# homeassistant.components.zhong_hong # homeassistant.components.zhong_hong
zhong_hong_hvac==1.0.9 zhong_hong_hvac==1.0.9
@ -2167,10 +2167,10 @@ zigpy-cc==0.1.0
zigpy-deconz==0.7.0 zigpy-deconz==0.7.0
# homeassistant.components.zha # homeassistant.components.zha
zigpy-homeassistant==0.15.0 zigpy-homeassistant==0.16.0
# homeassistant.components.zha # homeassistant.components.zha
zigpy-xbee-homeassistant==0.9.0 zigpy-xbee-homeassistant==0.10.0
# homeassistant.components.zha # homeassistant.components.zha
zigpy-zigate==0.5.1 zigpy-zigate==0.5.1

8
requirements_test_all.txt
View File

@ -118,7 +118,7 @@ av==6.1.2
axis==25 axis==25
# homeassistant.components.zha # homeassistant.components.zha
bellows-homeassistant==0.13.2 bellows-homeassistant==0.14.0
# homeassistant.components.bom # homeassistant.components.bom
bomradarloop==0.1.3 bomradarloop==0.1.3
@ -741,7 +741,7 @@ yahooweather==0.10
zeroconf==0.24.5 zeroconf==0.24.5
# homeassistant.components.zha # homeassistant.components.zha
zha-quirks==0.0.35 zha-quirks==0.0.36
# homeassistant.components.zha # homeassistant.components.zha
zigpy-cc==0.1.0 zigpy-cc==0.1.0
@ -750,10 +750,10 @@ zigpy-cc==0.1.0
zigpy-deconz==0.7.0 zigpy-deconz==0.7.0
# homeassistant.components.zha # homeassistant.components.zha
zigpy-homeassistant==0.15.0 zigpy-homeassistant==0.16.0
# homeassistant.components.zha # homeassistant.components.zha
zigpy-xbee-homeassistant==0.9.0 zigpy-xbee-homeassistant==0.10.0
# homeassistant.components.zha # homeassistant.components.zha
zigpy-zigate==0.5.1 zigpy-zigate==0.5.1

14
tests/components/zha/test_cover.py
View File

@ -88,7 +88,7 @@ async def test_cover(m1, hass, zha_device_joined_restored, zigpy_cover_device):
) )
assert cluster.request.call_count == 1 assert cluster.request.call_count == 1
assert cluster.request.call_args == call( assert cluster.request.call_args == call(
False, 0x1, (), expect_reply=True, manufacturer=None False, 0x1, (), expect_reply=True, manufacturer=None, tsn=None
) )
# open from UI # open from UI
@ -100,7 +100,7 @@ async def test_cover(m1, hass, zha_device_joined_restored, zigpy_cover_device):
) )
assert cluster.request.call_count == 1 assert cluster.request.call_count == 1
assert cluster.request.call_args == call( assert cluster.request.call_args == call(
False, 0x0, (), expect_reply=True, manufacturer=None False, 0x0, (), expect_reply=True, manufacturer=None, tsn=None
) )
# set position UI # set position UI
@ -115,7 +115,13 @@ async def test_cover(m1, hass, zha_device_joined_restored, zigpy_cover_device):
) )
assert cluster.request.call_count == 1 assert cluster.request.call_count == 1
assert cluster.request.call_args == call( assert cluster.request.call_args == call(
False, 0x5, (zigpy.types.uint8_t,), 53, expect_reply=True, manufacturer=None False,
0x5,
(zigpy.types.uint8_t,),
53,
expect_reply=True,
manufacturer=None,
tsn=None,
) )
# stop from UI # stop from UI
@ -127,7 +133,7 @@ async def test_cover(m1, hass, zha_device_joined_restored, zigpy_cover_device):
) )
assert cluster.request.call_count == 1 assert cluster.request.call_count == 1
assert cluster.request.call_args == call( assert cluster.request.call_args == call(
False, 0x2, (), expect_reply=True, manufacturer=None False, 0x2, (), expect_reply=True, manufacturer=None, tsn=None
) )
# test rejoin # test rejoin

1
tests/components/zha/test_discover.py
View File

@ -107,6 +107,7 @@ async def test_devices(
0, 0,
expect_reply=True, expect_reply=True,
manufacturer=None, manufacturer=None,
tsn=None,
) )
event_channels = { event_channels = {

14
tests/components/zha/test_light.py
View File

@ -181,7 +181,7 @@ async def async_test_on_off_from_hass(hass, cluster, entity_id):
assert cluster.request.call_count == 1 assert cluster.request.call_count == 1
assert cluster.request.await_count == 1 assert cluster.request.await_count == 1
assert cluster.request.call_args == call( assert cluster.request.call_args == call(
False, ON, (), expect_reply=True, manufacturer=None False, ON, (), expect_reply=True, manufacturer=None, tsn=None
) )
await async_test_off_from_hass(hass, cluster, entity_id) await async_test_off_from_hass(hass, cluster, entity_id)
@ -198,7 +198,7 @@ async def async_test_off_from_hass(hass, cluster, entity_id):
assert cluster.request.call_count == 1 assert cluster.request.call_count == 1
assert cluster.request.await_count == 1 assert cluster.request.await_count == 1
assert cluster.request.call_args == call( assert cluster.request.call_args == call(
False, OFF, (), expect_reply=True, manufacturer=None False, OFF, (), expect_reply=True, manufacturer=None, tsn=None
) )
@ -208,6 +208,7 @@ async def async_test_level_on_off_from_hass(
"""Test on off functionality from hass.""" """Test on off functionality from hass."""
on_off_cluster.request.reset_mock() on_off_cluster.request.reset_mock()
level_cluster.request.reset_mock()
# turn on via UI # turn on via UI
await hass.services.async_call( await hass.services.async_call(
DOMAIN, "turn_on", {"entity_id": entity_id}, blocking=True DOMAIN, "turn_on", {"entity_id": entity_id}, blocking=True
@ -217,7 +218,7 @@ async def async_test_level_on_off_from_hass(
assert level_cluster.request.call_count == 0 assert level_cluster.request.call_count == 0
assert level_cluster.request.await_count == 0 assert level_cluster.request.await_count == 0
assert on_off_cluster.request.call_args == call( assert on_off_cluster.request.call_args == call(
False, ON, (), expect_reply=True, manufacturer=None False, ON, (), expect_reply=True, manufacturer=None, tsn=None
) )
on_off_cluster.request.reset_mock() on_off_cluster.request.reset_mock()
level_cluster.request.reset_mock() level_cluster.request.reset_mock()
@ -230,7 +231,7 @@ async def async_test_level_on_off_from_hass(
assert level_cluster.request.call_count == 1 assert level_cluster.request.call_count == 1
assert level_cluster.request.await_count == 1 assert level_cluster.request.await_count == 1
assert on_off_cluster.request.call_args == call( assert on_off_cluster.request.call_args == call(
False, ON, (), expect_reply=True, manufacturer=None False, ON, (), expect_reply=True, manufacturer=None, tsn=None
) )
assert level_cluster.request.call_args == call( assert level_cluster.request.call_args == call(
False, False,
@ -240,6 +241,7 @@ async def async_test_level_on_off_from_hass(
100.0, 100.0,
expect_reply=True, expect_reply=True,
manufacturer=None, manufacturer=None,
tsn=None,
) )
on_off_cluster.request.reset_mock() on_off_cluster.request.reset_mock()
level_cluster.request.reset_mock() level_cluster.request.reset_mock()
@ -252,7 +254,7 @@ async def async_test_level_on_off_from_hass(
assert level_cluster.request.call_count == 1 assert level_cluster.request.call_count == 1
assert level_cluster.request.await_count == 1 assert level_cluster.request.await_count == 1
assert on_off_cluster.request.call_args == call( assert on_off_cluster.request.call_args == call(
False, ON, (), expect_reply=True, manufacturer=None False, ON, (), expect_reply=True, manufacturer=None, tsn=None
) )
assert level_cluster.request.call_args == call( assert level_cluster.request.call_args == call(
False, False,
@ -262,6 +264,7 @@ async def async_test_level_on_off_from_hass(
0, 0,
expect_reply=True, expect_reply=True,
manufacturer=None, manufacturer=None,
tsn=None,
) )
on_off_cluster.request.reset_mock() on_off_cluster.request.reset_mock()
level_cluster.request.reset_mock() level_cluster.request.reset_mock()
@ -299,4 +302,5 @@ async def async_test_flash_from_hass(hass, cluster, entity_id, flash):
0, 0,
expect_reply=True, expect_reply=True,
manufacturer=None, manufacturer=None,
tsn=None,
) )

4
tests/components/zha/test_switch.py
View File

@ -76,7 +76,7 @@ async def test_switch(hass, zha_device_joined_restored, zigpy_device):
) )
assert len(cluster.request.mock_calls) == 1 assert len(cluster.request.mock_calls) == 1
assert cluster.request.call_args == call( assert cluster.request.call_args == call(
False, ON, (), expect_reply=True, manufacturer=None False, ON, (), expect_reply=True, manufacturer=None, tsn=None
) )
# turn off from HA # turn off from HA
@ -90,7 +90,7 @@ async def test_switch(hass, zha_device_joined_restored, zigpy_device):
) )
assert len(cluster.request.mock_calls) == 1 assert len(cluster.request.mock_calls) == 1
assert cluster.request.call_args == call( assert cluster.request.call_args == call(
False, OFF, (), expect_reply=True, manufacturer=None False, OFF, (), expect_reply=True, manufacturer=None, tsn=None
) )
# test joining a new switch to the network and HA # test joining a new switch to the network and HA