jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-26 10:17:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move imports to top for homekit (#29560)

Browse Source 
* Move imports to top for homekit

* Moved back a couple imports, added annotation to disable import-outside-toplevel

* Fix all tests in test_homekit.py
This commit is contained in:
springstan 2019-12-09 16:10:02 +01:00 committed by Paulus Schoutsen
parent bb3fa6990a
commit 72f336a2dd
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
homeassistant/components/homekit/__init__.py
View File

@ -29,6 +29,7 @@ from homeassistant.helpers.entityfilter import FILTER_SCHEMA
from homeassistant.util import get_local_ip from homeassistant.util import get_local_ip
from homeassistant.util.decorator import Registry from homeassistant.util.decorator import Registry
from .accessories import HomeBridge, HomeDriver
from .const import ( from .const import (
BRIDGE_NAME, BRIDGE_NAME,
CONF_ADVERTISE_IP, CONF_ADVERTISE_IP,
@ -302,7 +303,6 @@ class HomeKit:
def setup(self): def setup(self):
"""Set up bridge and accessory driver.""" """Set up bridge and accessory driver."""
from .accessories import HomeBridge, HomeDriver
self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, self.stop) self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, self.stop)
@ -361,7 +361,7 @@ class HomeKit:
return return
self.status = STATUS_WAIT self.status = STATUS_WAIT
from . import ( # noqa: F401 pylint: disable=unused-import from . import ( # noqa: F401 pylint: disable=unused-import, import-outside-toplevel
type_covers, type_covers,
type_fans, type_fans,
type_lights, type_lights,

12
tests/components/homekit/test_homekit.py
View File

@ -126,7 +126,7 @@ async def test_homekit_setup(hass, hk_driver):
homekit = HomeKit(hass, BRIDGE_NAME, DEFAULT_PORT, None, {}, {}, DEFAULT_SAFE_MODE) homekit = HomeKit(hass, BRIDGE_NAME, DEFAULT_PORT, None, {}, {}, DEFAULT_SAFE_MODE)
with patch( with patch(
PATH_HOMEKIT + ".accessories.HomeDriver", return_value=hk_driver PATH_HOMEKIT + ".HomeDriver", return_value=hk_driver
) as mock_driver, patch("homeassistant.util.get_local_ip") as mock_ip: ) as mock_driver, patch("homeassistant.util.get_local_ip") as mock_ip:
mock_ip.return_value = IP_ADDRESS mock_ip.return_value = IP_ADDRESS
await hass.async_add_job(homekit.setup) await hass.async_add_job(homekit.setup)
@ -150,9 +150,7 @@ async def test_homekit_setup_ip_address(hass, hk_driver):
"""Test setup with given IP address.""" """Test setup with given IP address."""
homekit = HomeKit(hass, BRIDGE_NAME, DEFAULT_PORT, "172.0.0.0", {}, {}, None) homekit = HomeKit(hass, BRIDGE_NAME, DEFAULT_PORT, "172.0.0.0", {}, {}, None)
with patch( with patch(PATH_HOMEKIT + ".HomeDriver", return_value=hk_driver) as mock_driver:
PATH_HOMEKIT + ".accessories.HomeDriver", return_value=hk_driver
) as mock_driver:
await hass.async_add_job(homekit.setup) await hass.async_add_job(homekit.setup)
mock_driver.assert_called_with( mock_driver.assert_called_with(
hass, hass,
@ -169,9 +167,7 @@ async def test_homekit_setup_advertise_ip(hass, hk_driver):
hass, BRIDGE_NAME, DEFAULT_PORT, "0.0.0.0", {}, {}, None, "192.168.1.100" hass, BRIDGE_NAME, DEFAULT_PORT, "0.0.0.0", {}, {}, None, "192.168.1.100"
) )
with patch( with patch(PATH_HOMEKIT + ".HomeDriver", return_value=hk_driver) as mock_driver:
PATH_HOMEKIT + ".accessories.HomeDriver", return_value=hk_driver
) as mock_driver:
await hass.async_add_job(homekit.setup) await hass.async_add_job(homekit.setup)
mock_driver.assert_called_with( mock_driver.assert_called_with(
hass, hass,
@ -186,7 +182,7 @@ async def test_homekit_setup_safe_mode(hass, hk_driver):
"""Test if safe_mode flag is set.""" """Test if safe_mode flag is set."""
homekit = HomeKit(hass, BRIDGE_NAME, DEFAULT_PORT, None, {}, {}, True) homekit = HomeKit(hass, BRIDGE_NAME, DEFAULT_PORT, None, {}, {}, True)
with patch(PATH_HOMEKIT + ".accessories.HomeDriver", return_value=hk_driver): with patch(PATH_HOMEKIT + ".HomeDriver", return_value=hk_driver):
await hass.async_add_job(homekit.setup) await hass.async_add_job(homekit.setup)
assert homekit.driver.safe_mode is True assert homekit.driver.safe_mode is True