From ddab7f3024245e0a67b6aa5470754736e86e22a3 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 7 Oct 2021 17:06:27 -1000 Subject: [PATCH] Bump HAP-python to 4.30 (#57284) --- homeassistant/components/homekit/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- tests/components/homekit/test_type_fans.py | 6 +++--- tests/components/homekit/test_type_media_players.py | 7 +++++-- tests/components/homekit/test_type_remote.py | 7 +++++-- tests/components/homekit/test_type_thermostats.py | 6 +----- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/homeassistant/components/homekit/manifest.json b/homeassistant/components/homekit/manifest.json index 2589a1ac6ec..d23aa11b4ea 100644 --- a/homeassistant/components/homekit/manifest.json +++ b/homeassistant/components/homekit/manifest.json @@ -3,7 +3,7 @@ "name": "HomeKit", "documentation": "https://www.home-assistant.io/integrations/homekit", "requirements": [ - "HAP-python==4.2.1", + "HAP-python==4.3.0", "fnvhash==0.1.0", "PyQRCode==1.2.1", "base36==0.1.1" diff --git a/requirements_all.txt b/requirements_all.txt index 5a7b14e9ab1..d2e39a25663 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -14,7 +14,7 @@ Adafruit-SHT31==1.0.2 # Adafruit_BBIO==1.1.1 # homeassistant.components.homekit -HAP-python==4.2.1 +HAP-python==4.3.0 # homeassistant.components.mastodon Mastodon.py==1.5.1 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index e32d8510fcc..b9e8363683c 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -7,7 +7,7 @@ AEMET-OpenData==0.2.1 # homeassistant.components.homekit -HAP-python==4.2.1 +HAP-python==4.3.0 # homeassistant.components.flick_electric PyFlick==0.0.2 diff --git a/tests/components/homekit/test_type_fans.py b/tests/components/homekit/test_type_fans.py index 15e2366a883..85d00dcb287 100644 --- a/tests/components/homekit/test_type_fans.py +++ b/tests/components/homekit/test_type_fans.py @@ -297,7 +297,7 @@ async def test_fan_speed(hass, hk_driver, events): ) await hass.async_add_executor_job(acc.char_speed.client_update_value, 42) await hass.async_block_till_done() - assert acc.char_speed.value == 42 + assert acc.char_speed.value == 50 assert acc.char_active.value == 1 assert call_set_percentage[0] @@ -309,7 +309,7 @@ async def test_fan_speed(hass, hk_driver, events): # Verify speed is preserved from off to on hass.states.async_set(entity_id, STATE_OFF, {ATTR_PERCENTAGE: 42}) await hass.async_block_till_done() - assert acc.char_speed.value == 42 + assert acc.char_speed.value == 50 assert acc.char_active.value == 0 hk_driver.set_characteristics( @@ -325,7 +325,7 @@ async def test_fan_speed(hass, hk_driver, events): "mock_addr", ) await hass.async_block_till_done() - assert acc.char_speed.value == 42 + assert acc.char_speed.value == 50 assert acc.char_active.value == 1 diff --git a/tests/components/homekit/test_type_media_players.py b/tests/components/homekit/test_type_media_players.py index 33cac7bcf8a..c0184667e2c 100644 --- a/tests/components/homekit/test_type_media_players.py +++ b/tests/components/homekit/test_type_media_players.py @@ -1,5 +1,7 @@ """Test different accessory types: Media Players.""" +import pytest + from homeassistant.components.homekit.const import ( ATTR_KEY_NAME, ATTR_VALUE, @@ -353,8 +355,9 @@ async def test_media_player_television(hass, hk_driver, events, caplog): hass.bus.async_listen(EVENT_HOMEKIT_TV_REMOTE_KEY_PRESSED, listener) - await hass.async_add_executor_job(acc.char_remote_key.client_update_value, 20) - await hass.async_block_till_done() + with pytest.raises(ValueError): + await hass.async_add_executor_job(acc.char_remote_key.client_update_value, 20) + await hass.async_block_till_done() await hass.async_add_executor_job(acc.char_remote_key.client_update_value, 7) await hass.async_block_till_done() diff --git a/tests/components/homekit/test_type_remote.py b/tests/components/homekit/test_type_remote.py index ee71d7f4e3c..5c5b5ee6cd9 100644 --- a/tests/components/homekit/test_type_remote.py +++ b/tests/components/homekit/test_type_remote.py @@ -1,5 +1,7 @@ """Test different accessory types: Remotes.""" +import pytest + from homeassistant.components.homekit.const import ( ATTR_KEY_NAME, ATTR_VALUE, @@ -140,8 +142,9 @@ async def test_activity_remote(hass, hk_driver, events, caplog): hass.bus.async_listen(EVENT_HOMEKIT_TV_REMOTE_KEY_PRESSED, listener) - acc.char_remote_key.client_update_value(20) - await hass.async_block_till_done() + with pytest.raises(ValueError): + acc.char_remote_key.client_update_value(20) + await hass.async_block_till_done() acc.char_remote_key.client_update_value(7) await hass.async_block_till_done() diff --git a/tests/components/homekit/test_type_thermostats.py b/tests/components/homekit/test_type_thermostats.py index e73465b0ab0..ef517f4ab96 100644 --- a/tests/components/homekit/test_type_thermostats.py +++ b/tests/components/homekit/test_type_thermostats.py @@ -1746,11 +1746,7 @@ async def test_water_heater(hass, hk_driver, events): assert len(events) == 1 assert events[-1].data[ATTR_VALUE] == f"52.0{TEMP_CELSIUS}" - await hass.async_add_executor_job(acc.char_target_heat_cool.client_update_value, 0) - await hass.async_block_till_done() - assert acc.char_target_heat_cool.value == 1 - - await hass.async_add_executor_job(acc.char_target_heat_cool.client_update_value, 2) + await hass.async_add_executor_job(acc.char_target_heat_cool.client_update_value, 1) await hass.async_block_till_done() assert acc.char_target_heat_cool.value == 1