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

Bump HAP-python to 3.4.0 (#47476)

Browse source 
* Bump HAP-python to 3.3.3

* bump

* fix mocking
This commit is contained in:
J. Nick Koston 2021-03-06 14:30:57 -10:00 • committed by GitHub
parent 79b5ca9415
commit 2e89f152ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/homekit/__init__.py
View file

@ -616,7 +616,7 @@ class HomeKit:
self._async_register_bridge(dev_reg) self._async_register_bridge(dev_reg)
await self._async_start(bridged_states) await self._async_start(bridged_states)
_LOGGER.debug("Driver start for %s", self._name) _LOGGER.debug("Driver start for %s", self._name)
self.hass.add_job(self.driver.start_service) await self.driver.async_start()
self.status = STATUS_RUNNING self.status = STATUS_RUNNING
@callback @callback

2
homeassistant/components/homekit/manifest.json
View file

@ -3,7 +3,7 @@
"name": "HomeKit", "name": "HomeKit",
"documentation": "https://www.home-assistant.io/integrations/homekit", "documentation": "https://www.home-assistant.io/integrations/homekit",
"requirements": [ "requirements": [
"HAP-python==3.3.2", "HAP-python==3.4.0",
"fnvhash==0.1.0", "fnvhash==0.1.0",
"PyQRCode==1.2.1", "PyQRCode==1.2.1",
"base36==0.1.1", "base36==0.1.1",

2
requirements_all.txt
View file

@ -17,7 +17,7 @@ Adafruit-SHT31==1.0.2
# Adafruit_BBIO==1.1.1 # Adafruit_BBIO==1.1.1
# homeassistant.components.homekit # homeassistant.components.homekit
HAP-python==3.3.2 HAP-python==3.4.0
# homeassistant.components.mastodon # homeassistant.components.mastodon
Mastodon.py==1.5.1 Mastodon.py==1.5.1

2
requirements_test_all.txt
View file

@ -7,7 +7,7 @@
AEMET-OpenData==0.1.8 AEMET-OpenData==0.1.8
# homeassistant.components.homekit # homeassistant.components.homekit
HAP-python==3.3.2 HAP-python==3.4.0
# homeassistant.components.flick_electric # homeassistant.components.flick_electric
PyFlick==0.0.2 PyFlick==0.0.2

26
tests/components/homekit/test_homekit.py
View file

@ -493,7 +493,7 @@ async def test_homekit_start(hass, hk_driver, device_reg):
) as mock_setup_msg, patch( ) as mock_setup_msg, patch(
"pyhap.accessory_driver.AccessoryDriver.add_accessory" "pyhap.accessory_driver.AccessoryDriver.add_accessory"
) as hk_driver_add_acc, patch( ) as hk_driver_add_acc, patch(
"pyhap.accessory_driver.AccessoryDriver.start_service" "pyhap.accessory_driver.AccessoryDriver.async_start"
) as hk_driver_start: ) as hk_driver_start:
await homekit.async_start() await homekit.async_start()
@ -528,7 +528,7 @@ async def test_homekit_start(hass, hk_driver, device_reg):
) as mock_setup_msg, patch( ) as mock_setup_msg, patch(
"pyhap.accessory_driver.AccessoryDriver.add_accessory" "pyhap.accessory_driver.AccessoryDriver.add_accessory"
) as hk_driver_add_acc, patch( ) as hk_driver_add_acc, patch(
"pyhap.accessory_driver.AccessoryDriver.start_service" "pyhap.accessory_driver.AccessoryDriver.async_start"
) as hk_driver_start: ) as hk_driver_start:
await homekit.async_start() await homekit.async_start()
@ -567,7 +567,7 @@ async def test_homekit_start_with_a_broken_accessory(hass, hk_driver, mock_zeroc
) as mock_setup_msg, patch( ) as mock_setup_msg, patch(
"pyhap.accessory_driver.AccessoryDriver.add_accessory", "pyhap.accessory_driver.AccessoryDriver.add_accessory",
) as hk_driver_add_acc, patch( ) as hk_driver_add_acc, patch(
"pyhap.accessory_driver.AccessoryDriver.start_service" "pyhap.accessory_driver.AccessoryDriver.async_start"
) as hk_driver_start: ) as hk_driver_start:
await homekit.async_start() await homekit.async_start()
@ -630,7 +630,7 @@ async def test_homekit_reset_accessories(hass, mock_zeroconf):
), patch("pyhap.accessory.Bridge.add_accessory") as mock_add_accessory, patch( ), patch("pyhap.accessory.Bridge.add_accessory") as mock_add_accessory, patch(
"pyhap.accessory_driver.AccessoryDriver.config_changed" "pyhap.accessory_driver.AccessoryDriver.config_changed"
) as hk_driver_config_changed, patch( ) as hk_driver_config_changed, patch(
"pyhap.accessory_driver.AccessoryDriver.start_service" "pyhap.accessory_driver.AccessoryDriver.async_start"
): ):
await async_init_entry(hass, entry) await async_init_entry(hass, entry)
@ -674,7 +674,7 @@ async def test_homekit_too_many_accessories(hass, hk_driver, caplog, mock_zeroco
hass.states.async_set("light.demo2", "on") hass.states.async_set("light.demo2", "on")
hass.states.async_set("light.demo3", "on") hass.states.async_set("light.demo3", "on")
with patch("pyhap.accessory_driver.AccessoryDriver.start_service"), patch( with patch("pyhap.accessory_driver.AccessoryDriver.async_start"), patch(
"pyhap.accessory_driver.AccessoryDriver.add_accessory" "pyhap.accessory_driver.AccessoryDriver.add_accessory"
), patch(f"{PATH_HOMEKIT}.show_setup_message"), patch( ), patch(f"{PATH_HOMEKIT}.show_setup_message"), patch(
f"{PATH_HOMEKIT}.HomeBridge", _mock_bridge f"{PATH_HOMEKIT}.HomeBridge", _mock_bridge
@ -738,7 +738,7 @@ async def test_homekit_finds_linked_batteries(
with patch.object(homekit.bridge, "add_accessory"), patch( with patch.object(homekit.bridge, "add_accessory"), patch(
f"{PATH_HOMEKIT}.show_setup_message" f"{PATH_HOMEKIT}.show_setup_message"
), patch(f"{PATH_HOMEKIT}.get_accessory") as mock_get_acc, patch( ), patch(f"{PATH_HOMEKIT}.get_accessory") as mock_get_acc, patch(
"pyhap.accessory_driver.AccessoryDriver.start_service" "pyhap.accessory_driver.AccessoryDriver.async_start"
): ):
await homekit.async_start() await homekit.async_start()
await hass.async_block_till_done() await hass.async_block_till_done()
@ -810,7 +810,7 @@ async def test_homekit_async_get_integration_fails(
with patch.object(homekit.bridge, "add_accessory"), patch( with patch.object(homekit.bridge, "add_accessory"), patch(
f"{PATH_HOMEKIT}.show_setup_message" f"{PATH_HOMEKIT}.show_setup_message"
), patch(f"{PATH_HOMEKIT}.get_accessory") as mock_get_acc, patch( ), patch(f"{PATH_HOMEKIT}.get_accessory") as mock_get_acc, patch(
"pyhap.accessory_driver.AccessoryDriver.start_service" "pyhap.accessory_driver.AccessoryDriver.async_start"
): ):
await homekit.async_start() await homekit.async_start()
await hass.async_block_till_done() await hass.async_block_till_done()
@ -895,7 +895,7 @@ async def test_homekit_uses_system_zeroconf(hass, hk_driver, mock_zeroconf):
assert await async_setup_component(hass, "zeroconf", {"zeroconf": {}}) assert await async_setup_component(hass, "zeroconf", {"zeroconf": {}})
system_zc = await zeroconf.async_get_instance(hass) system_zc = await zeroconf.async_get_instance(hass)
with patch("pyhap.accessory_driver.AccessoryDriver.start_service"), patch( with patch("pyhap.accessory_driver.AccessoryDriver.async_start"), patch(
f"{PATH_HOMEKIT}.HomeKit.async_stop" f"{PATH_HOMEKIT}.HomeKit.async_stop"
): ):
entry.add_to_hass(hass) entry.add_to_hass(hass)
@ -963,7 +963,7 @@ async def test_homekit_ignored_missing_devices(
with patch.object(homekit.bridge, "add_accessory"), patch( with patch.object(homekit.bridge, "add_accessory"), patch(
f"{PATH_HOMEKIT}.show_setup_message" f"{PATH_HOMEKIT}.show_setup_message"
), patch(f"{PATH_HOMEKIT}.get_accessory") as mock_get_acc, patch( ), patch(f"{PATH_HOMEKIT}.get_accessory") as mock_get_acc, patch(
"pyhap.accessory_driver.AccessoryDriver.start_service" "pyhap.accessory_driver.AccessoryDriver.async_start"
): ):
await homekit.async_start() await homekit.async_start()
await hass.async_block_till_done() await hass.async_block_till_done()
@ -1025,7 +1025,7 @@ async def test_homekit_finds_linked_motion_sensors(
with patch.object(homekit.bridge, "add_accessory"), patch( with patch.object(homekit.bridge, "add_accessory"), patch(
f"{PATH_HOMEKIT}.show_setup_message" f"{PATH_HOMEKIT}.show_setup_message"
), patch(f"{PATH_HOMEKIT}.get_accessory") as mock_get_acc, patch( ), patch(f"{PATH_HOMEKIT}.get_accessory") as mock_get_acc, patch(
"pyhap.accessory_driver.AccessoryDriver.start_service" "pyhap.accessory_driver.AccessoryDriver.async_start"
): ):
await homekit.async_start() await homekit.async_start()
await hass.async_block_till_done() await hass.async_block_till_done()
@ -1090,7 +1090,7 @@ async def test_homekit_finds_linked_humidity_sensors(
with patch.object(homekit.bridge, "add_accessory"), patch( with patch.object(homekit.bridge, "add_accessory"), patch(
f"{PATH_HOMEKIT}.show_setup_message" f"{PATH_HOMEKIT}.show_setup_message"
), patch(f"{PATH_HOMEKIT}.get_accessory") as mock_get_acc, patch( ), patch(f"{PATH_HOMEKIT}.get_accessory") as mock_get_acc, patch(
"pyhap.accessory_driver.AccessoryDriver.start_service" "pyhap.accessory_driver.AccessoryDriver.async_start"
): ):
await homekit.async_start() await homekit.async_start()
await hass.async_block_till_done() await hass.async_block_till_done()
@ -1153,7 +1153,7 @@ async def test_reload(hass, mock_zeroconf):
), patch( ), patch(
f"{PATH_HOMEKIT}.get_accessory" f"{PATH_HOMEKIT}.get_accessory"
), patch( ), patch(
"pyhap.accessory_driver.AccessoryDriver.start_service" "pyhap.accessory_driver.AccessoryDriver.async_start"
): ):
mock_homekit2.return_value = homekit = Mock() mock_homekit2.return_value = homekit = Mock()
type(homekit).async_start = AsyncMock() type(homekit).async_start = AsyncMock()
@ -1205,7 +1205,7 @@ async def test_homekit_start_in_accessory_mode(hass, hk_driver, device_reg):
with patch(f"{PATH_HOMEKIT}.HomeKit.add_bridge_accessory") as mock_add_acc, patch( with patch(f"{PATH_HOMEKIT}.HomeKit.add_bridge_accessory") as mock_add_acc, patch(
"pyhap.accessory_driver.AccessoryDriver.add_accessory" "pyhap.accessory_driver.AccessoryDriver.add_accessory"
), patch(f"{PATH_HOMEKIT}.show_setup_message") as mock_setup_msg, patch( ), patch(f"{PATH_HOMEKIT}.show_setup_message") as mock_setup_msg, patch(
"pyhap.accessory_driver.AccessoryDriver.start_service" "pyhap.accessory_driver.AccessoryDriver.async_start"
) as hk_driver_start: ) as hk_driver_start:
await homekit.async_start() await homekit.async_start()