Add communication data attributes to Zwave node_entity (#6813)

* Add quality attribute to node

* Move quality to node_entity

* adjustments

* Line lenght

* flake8

* Cleanup and add each entry from getNodeStatistics as attribute

* resolve conflict

* Move NETWORK to hass.data

* Test Done

* Cleanup from review

* Resolve conflicts

* Review changes

* Long lines....

* blank line

* import-error-disable

* Update tests Part1... Again

* Hound

* Argh!

* Argh!

* YABBADABBADOOOOOOO!

* Enhance tests

* hound

* Resolve

* resolve tests...
This commit is contained in:
John Arild Berentsen authored and GitHub committed 2017-04-12 19:09:29 +02:00
1 parent f68542ba0d
commit d63028e44a
8 files changed
+240 -148

No files matched your search

+41 -34
View File
@@ -7,7 +7,7 @@ from homeassistant.const import ATTR_ENTITY_ID, EVENT_HOMEASSISTANT_START
from homeassistant.components import zwave
from homeassistant.components.binary_sensor.zwave import get_device
from homeassistant.components.zwave import (
const, CONFIG_SCHEMA, CONF_DEVICE_CONFIG_GLOB)
const, CONFIG_SCHEMA, CONF_DEVICE_CONFIG_GLOB, ZWAVE_NETWORK)
from homeassistant.setup import setup_component
import pytest
@@ -70,10 +70,10 @@ def test_config_access_error():
@asyncio.coroutine
@patch.object(zwave, 'NETWORK')
def test_setup_platform(mock_network, hass, mock_openzwave):
def test_setup_platform(hass, mock_openzwave):
"""Test invalid device config."""
mock_device = MagicMock()
hass.data[ZWAVE_NETWORK] = MagicMock()
hass.data[zwave.DATA_ZWAVE_DICT] = {456: mock_device}
async_add_devices = MagicMock()
@@ -104,7 +104,7 @@ def test_zwave_ready_wait(hass, mock_openzwave):
with patch.object(zwave.time, 'sleep') as mock_sleep:
with patch.object(zwave, '_LOGGER') as mock_logger:
zwave.NETWORK.state = MockNetwork.STATE_STARTED
hass.data[ZWAVE_NETWORK].state = MockNetwork.STATE_STARTED
hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
yield from hass.async_block_till_done()
@@ -473,12 +473,15 @@ class TestZWaveServices(unittest.TestCase):
# Initialize zwave
setup_component(self.hass, 'zwave', {'zwave': {}})
self.hass.block_till_done()
zwave.NETWORK.state = MockNetwork.STATE_READY
self.zwave_network = self.hass.data[ZWAVE_NETWORK]
self.zwave_network.state = MockNetwork.STATE_READY
self.hass.bus.fire(EVENT_HOMEASSISTANT_START)
self.hass.block_till_done()
def tearDown(self): # pylint: disable=invalid-name
"""Stop everything that was started."""
self.hass.services.call('zwave', 'stop_network', {})
self.hass.block_till_done()
self.hass.stop()
def test_add_node(self):
@@ -486,58 +489,62 @@ class TestZWaveServices(unittest.TestCase):
self.hass.services.call('zwave', 'add_node', {})
self.hass.block_till_done()
assert zwave.NETWORK.controller.add_node.called
assert len(zwave.NETWORK.controller.add_node.mock_calls) == 1
assert len(zwave.NETWORK.controller.add_node.mock_calls[0][1]) == 0
assert self.zwave_network.controller.add_node.called
assert len(self.zwave_network.controller
.add_node.mock_calls) == 1
assert len(self.zwave_network.controller
.add_node.mock_calls[0][1]) == 0
def test_add_node_secure(self):
"""Test zwave add_node_secure service."""
self.hass.services.call('zwave', 'add_node_secure', {})
self.hass.block_till_done()
assert zwave.NETWORK.controller.add_node.called
assert len(zwave.NETWORK.controller.add_node.mock_calls) == 1
assert zwave.NETWORK.controller.add_node.mock_calls[0][1][0] is True
assert self.zwave_network.controller.add_node.called
assert len(self.zwave_network.controller.add_node.mock_calls) == 1
assert (self.zwave_network.controller
.add_node.mock_calls[0][1][0] is True)
def test_remove_node(self):
"""Test zwave remove_node service."""
self.hass.services.call('zwave', 'remove_node', {})
self.hass.block_till_done()
assert zwave.NETWORK.controller.remove_node.called
assert len(zwave.NETWORK.controller.remove_node.mock_calls) == 1
assert self.zwave_network.controller.remove_node.called
assert len(self.zwave_network.controller.remove_node.mock_calls) == 1
def test_cancel_command(self):
"""Test zwave cancel_command service."""
self.hass.services.call('zwave', 'cancel_command', {})
self.hass.block_till_done()
assert zwave.NETWORK.controller.cancel_command.called
assert len(zwave.NETWORK.controller.cancel_command.mock_calls) == 1
assert self.zwave_network.controller.cancel_command.called
assert len(self.zwave_network.controller
.cancel_command.mock_calls) == 1
def test_heal_network(self):
"""Test zwave heal_network service."""
self.hass.services.call('zwave', 'heal_network', {})
self.hass.block_till_done()
assert zwave.NETWORK.heal.called
assert len(zwave.NETWORK.heal.mock_calls) == 1
assert self.zwave_network.heal.called
assert len(self.zwave_network.heal.mock_calls) == 1
def test_soft_reset(self):
"""Test zwave soft_reset service."""
self.hass.services.call('zwave', 'soft_reset', {})
self.hass.block_till_done()
assert zwave.NETWORK.controller.soft_reset.called
assert len(zwave.NETWORK.controller.soft_reset.mock_calls) == 1
assert self.zwave_network.controller.soft_reset.called
assert len(self.zwave_network.controller.soft_reset.mock_calls) == 1
def test_test_network(self):
"""Test zwave test_network service."""
self.hass.services.call('zwave', 'test_network', {})
self.hass.block_till_done()
assert zwave.NETWORK.test.called
assert len(zwave.NETWORK.test.mock_calls) == 1
assert self.zwave_network.test.called
assert len(self.zwave_network.test.mock_calls) == 1
def test_stop_network(self):
"""Test zwave stop_network service."""
@@ -545,22 +552,22 @@ class TestZWaveServices(unittest.TestCase):
self.hass.services.call('zwave', 'stop_network', {})
self.hass.block_till_done()
assert zwave.NETWORK.stop.called
assert len(zwave.NETWORK.stop.mock_calls) == 1
assert self.zwave_network.stop.called
assert len(self.zwave_network.stop.mock_calls) == 1
assert mock_fire.called
assert len(mock_fire.mock_calls) == 2
assert mock_fire.mock_calls[0][1][0] == const.EVENT_NETWORK_STOP
def test_rename_node(self):
"""Test zwave rename_node service."""
zwave.NETWORK.nodes = {11: MagicMock()}
self.zwave_network.nodes = {11: MagicMock()}
self.hass.services.call('zwave', 'rename_node', {
const.ATTR_NODE_ID: 11,
const.ATTR_NAME: 'test_name',
})
self.hass.block_till_done()
assert zwave.NETWORK.nodes[11].name == 'test_name'
assert self.zwave_network.nodes[11].name == 'test_name'
def test_remove_failed_node(self):
"""Test zwave remove_failed_node service."""
@@ -569,7 +576,7 @@ class TestZWaveServices(unittest.TestCase):
})
self.hass.block_till_done()
remove_failed_node = zwave.NETWORK.controller.remove_failed_node
remove_failed_node = self.zwave_network.controller.remove_failed_node
assert remove_failed_node.called
assert len(remove_failed_node.mock_calls) == 1
assert remove_failed_node.mock_calls[0][1][0] == 12
@@ -581,7 +588,7 @@ class TestZWaveServices(unittest.TestCase):
})
self.hass.block_till_done()
replace_failed_node = zwave.NETWORK.controller.replace_failed_node
replace_failed_node = self.zwave_network.controller.replace_failed_node
assert replace_failed_node.called
assert len(replace_failed_node.mock_calls) == 1
assert replace_failed_node.mock_calls[0][1][0] == 13
@@ -600,7 +607,7 @@ class TestZWaveServices(unittest.TestCase):
)
node = MockNode(node_id=14)
node.get_values.return_value = {12: value, 13: value_list}
zwave.NETWORK.nodes = {14: node}
self.zwave_network.nodes = {14: node}
self.hass.services.call('zwave', 'set_config_parameter', {
const.ATTR_NODE_ID: 14,
@@ -655,7 +662,7 @@ class TestZWaveServices(unittest.TestCase):
)
node = MockNode(node_id=14)
node.values = {12: value1, 13: value2}
zwave.NETWORK.nodes = {14: node}
self.zwave_network.nodes = {14: node}
with patch.object(zwave, '_LOGGER') as mock_logger:
self.hass.services.call('zwave', 'print_config_parameter', {
@@ -674,7 +681,7 @@ class TestZWaveServices(unittest.TestCase):
"""Test zwave print_config_parameter service."""
node1 = MockNode(node_id=14)
node2 = MockNode(node_id=15)
zwave.NETWORK.nodes = {14: node1, 15: node2}
self.zwave_network.nodes = {14: node1, 15: node2}
with patch.object(zwave, 'pprint') as mock_pprint:
self.hass.services.call('zwave', 'print_node', {
@@ -695,7 +702,7 @@ class TestZWaveServices(unittest.TestCase):
node = MockNode(node_id=14)
node.values = {12: value}
node.get_values.return_value = node.values
zwave.NETWORK.nodes = {14: node}
self.zwave_network.nodes = {14: node}
self.hass.services.call('zwave', 'set_wakeup', {
const.ATTR_NODE_ID: 14,
@@ -727,7 +734,7 @@ class TestZWaveServices(unittest.TestCase):
node = MockNode(node_id=14)
node.values = {12: value}
node.get_values.return_value = node.values
zwave.NETWORK.nodes = {14: node}
self.zwave_network.nodes = {14: node}
self.hass.services.call('zwave', 'change_association', {
const.ATTR_ASSOCIATION: 'add',
@@ -760,7 +767,7 @@ class TestZWaveServices(unittest.TestCase):
node = MockNode(node_id=14)
node.values = {12: value}
node.get_values.return_value = node.values
zwave.NETWORK.nodes = {14: node}
self.zwave_network.nodes = {14: node}
self.hass.services.call('zwave', 'change_association', {
const.ATTR_ASSOCIATION: 'remove',
@@ -808,7 +815,7 @@ class TestZWaveServices(unittest.TestCase):
def test_refresh_node(self):
"""Test zwave refresh_node service."""
node = MockNode(node_id=14)
zwave.NETWORK.nodes = {14: node}
self.zwave_network.nodes = {14: node}
self.hass.services.call('zwave', 'refresh_node', {
const.ATTR_NODE_ID: 14,
})