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

Move imports to top for ness_alarm (#29518)

Browse source 
* Move imports to top for ness_alarm

* Added patch for the ArminState in alarm_control_panel.py
This commit is contained in:
springstan 2019-12-09 18:46:56 +01:00 • committed by Franck Nijhof
parent 08f128e9c7
commit 6b6570e7ca
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@ from collections import namedtuple
import datetime import datetime
import logging import logging
from nessclient import ArmingState, Client
import voluptuous as vol import voluptuous as vol
from homeassistant.components.binary_sensor import DEVICE_CLASSES from homeassistant.components.binary_sensor import DEVICE_CLASSES
@ -82,7 +83,6 @@ SERVICE_SCHEMA_AUX = vol.Schema(
async def async_setup(hass, config): async def async_setup(hass, config):
"""Set up the Ness Alarm platform.""" """Set up the Ness Alarm platform."""
from nessclient import Client, ArmingState
conf = config[DOMAIN] conf = config[DOMAIN]

3
homeassistant/components/ness_alarm/alarm_control_panel.py
View file

@ -2,6 +2,8 @@
import logging import logging
from nessclient import ArmingState
import homeassistant.components.alarm_control_panel as alarm import homeassistant.components.alarm_control_panel as alarm
from homeassistant.components.alarm_control_panel.const import ( from homeassistant.components.alarm_control_panel.const import (
SUPPORT_ALARM_ARM_AWAY, SUPPORT_ALARM_ARM_AWAY,
@ -91,7 +93,6 @@ class NessAlarmPanel(alarm.AlarmControlPanel):
@callback @callback
def _handle_arming_state_change(self, arming_state): def _handle_arming_state_change(self, arming_state):
"""Handle arming state update.""" """Handle arming state update."""
from nessclient import ArmingState
if arming_state == ArmingState.UNKNOWN: if arming_state == ArmingState.UNKNOWN:
self._state = None self._state = None

13
tests/components/ness_alarm/test_init.py
View file

@ -32,8 +32,6 @@ from homeassistant.const import (
) )
from homeassistant.setup import async_setup_component from homeassistant.setup import async_setup_component
from tests.common import MockDependency
VALID_CONFIG = { VALID_CONFIG = {
DOMAIN: { DOMAIN: {
CONF_HOST: "alarm.local", CONF_HOST: "alarm.local",
@ -262,7 +260,12 @@ def mock_nessclient():
_mock_factory = MagicMock() _mock_factory = MagicMock()
_mock_factory.return_value = _mock_instance _mock_factory.return_value = _mock_instance
with MockDependency("nessclient"), patch( with patch(
"nessclient.Client", new=_mock_factory, create=True "homeassistant.components.ness_alarm.Client", new=_mock_factory, create=True
), patch("nessclient.ArmingState", new=MockArmingState): ), patch(
"homeassistant.components.ness_alarm.ArmingState", new=MockArmingState
), patch(
"homeassistant.components.ness_alarm.alarm_control_panel.ArmingState",
new=MockArmingState,
):
yield _mock_instance yield _mock_instance