From 599390d98517f34b1eea93e2c8dbd1ead2015725 Mon Sep 17 00:00:00 2001
From: cdce8p <30130371+cdce8p@users.noreply.github.com>
Date: Thu, 25 Oct 2018 09:45:56 +0200
Subject: [PATCH] Update HAP-python to 2.3.0 (#17778)

* Update HAP-python to 2.3.0

* Fix tests
---
 homeassistant/components/homekit/__init__.py        | 2 +-
 homeassistant/components/homekit/type_switches.py   | 8 +++-----
 requirements_all.txt                                | 2 +-
 requirements_test_all.txt                           | 2 +-
 tests/components/homekit/test_type_locks.py         | 1 +
 tests/components/homekit/test_type_media_players.py | 1 +
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/homekit/__init__.py b/homeassistant/components/homekit/__init__.py
index 1c30de918e3..d4d8fe0216c 100644
--- a/homeassistant/components/homekit/__init__.py
+++ b/homeassistant/components/homekit/__init__.py
@@ -29,7 +29,7 @@ from .const import (
 from .util import (
     show_setup_message, validate_entity_config, validate_media_player_features)
 
-REQUIREMENTS = ['HAP-python==2.2.2']
+REQUIREMENTS = ['HAP-python==2.3.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/homekit/type_switches.py b/homeassistant/components/homekit/type_switches.py
index 59ae17b5d9d..839abe5a580 100644
--- a/homeassistant/components/homekit/type_switches.py
+++ b/homeassistant/components/homekit/type_switches.py
@@ -1,7 +1,9 @@
 """Class to hold all switch accessories."""
 import logging
 
-from pyhap.const import CATEGORY_OUTLET, CATEGORY_SWITCH
+from pyhap.const import (
+    CATEGORY_FAUCET, CATEGORY_OUTLET, CATEGORY_SHOWER_HEAD,
+    CATEGORY_SPRINKLER, CATEGORY_SWITCH)
 
 from homeassistant.components.switch import DOMAIN
 from homeassistant.const import (
@@ -17,10 +19,6 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
-CATEGORY_SPRINKLER = 28
-CATEGORY_FAUCET = 29
-CATEGORY_SHOWER_HEAD = 30
-
 VALVE_TYPE = {
     TYPE_FAUCET: (CATEGORY_FAUCET, 3),
     TYPE_SHOWER: (CATEGORY_SHOWER_HEAD, 2),
diff --git a/requirements_all.txt b/requirements_all.txt
index f673bde5da0..afd5b4e9380 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -34,7 +34,7 @@ Adafruit-SHT31==1.0.2
 DoorBirdPy==0.1.3
 
 # homeassistant.components.homekit
-HAP-python==2.2.2
+HAP-python==2.3.0
 
 # homeassistant.components.notify.mastodon
 Mastodon.py==1.3.1
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 1eb3d3d5fe5..90d7756e69c 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -19,7 +19,7 @@ requests_mock==1.5.2
 
 
 # homeassistant.components.homekit
-HAP-python==2.2.2
+HAP-python==2.3.0
 
 # homeassistant.components.sensor.rmvtransport
 PyRMVtransport==0.1.3
diff --git a/tests/components/homekit/test_type_locks.py b/tests/components/homekit/test_type_locks.py
index e7e52c65559..8132099bd3e 100644
--- a/tests/components/homekit/test_type_locks.py
+++ b/tests/components/homekit/test_type_locks.py
@@ -82,6 +82,7 @@ async def test_no_code(hass, hk_driver, config, events):
     # Set from HomeKit
     call_lock = async_mock_service(hass, DOMAIN, 'lock')
 
+    acc.char_target_state.value = 0
     await hass.async_add_job(acc.char_target_state.client_update_value, 1)
     await hass.async_block_till_done()
     assert call_lock
diff --git a/tests/components/homekit/test_type_media_players.py b/tests/components/homekit/test_type_media_players.py
index 6b23b3cc58e..745e4c162bc 100644
--- a/tests/components/homekit/test_type_media_players.py
+++ b/tests/components/homekit/test_type_media_players.py
@@ -64,6 +64,7 @@ async def test_media_player_set_state(hass, hk_driver, events):
     call_media_stop = async_mock_service(hass, DOMAIN, 'media_stop')
     call_toggle_mute = async_mock_service(hass, DOMAIN, 'volume_mute')
 
+    acc.chars[FEATURE_ON_OFF].value = False
     await hass.async_add_job(acc.chars[FEATURE_ON_OFF]
                              .client_update_value, True)
     await hass.async_block_till_done()