Remove Z-Wave old/new entity_id attributes (#12652)

This commit is contained in:
Adam Mills authored and GitHub committed 2018-03-11 10:30:03 -04:00
1 parent f164a5a65f
commit dc8424032b
5 files changed
+19 -98

No files matched your search

+9 -28
View File
@@ -213,9 +213,7 @@ def test_node_discovery(hass, mock_openzwave):
mock_receivers.append(receiver)
with patch('pydispatch.dispatcher.connect', new=mock_connect):
yield from async_setup_component(hass, 'zwave', {'zwave': {
'new_entity_ids': True,
}})
yield from async_setup_component(hass, 'zwave', {'zwave': {}})
assert len(mock_receivers) == 1
@@ -237,7 +235,6 @@ def test_node_ignored(hass, mock_openzwave):
with patch('pydispatch.dispatcher.connect', new=mock_connect):
yield from async_setup_component(hass, 'zwave', {'zwave': {
'new_entity_ids': True,
'device_config': {
'zwave.mock_node': {
'ignored': True,
@@ -262,9 +259,7 @@ def test_value_discovery(hass, mock_openzwave):
mock_receivers.append(receiver)
with patch('pydispatch.dispatcher.connect', new=mock_connect):
yield from async_setup_component(hass, 'zwave', {'zwave': {
'new_entity_ids': True,
}})
yield from async_setup_component(hass, 'zwave', {'zwave': {}})
assert len(mock_receivers) == 1
@@ -289,9 +284,7 @@ def test_value_discovery_existing_entity(hass, mock_openzwave):
mock_receivers.append(receiver)
with patch('pydispatch.dispatcher.connect', new=mock_connect):
yield from async_setup_component(hass, 'zwave', {'zwave': {
'new_entity_ids': True,
}})
yield from async_setup_component(hass, 'zwave', {'zwave': {}})
assert len(mock_receivers) == 1
@@ -336,9 +329,7 @@ def test_power_schemes(hass, mock_openzwave):
mock_receivers.append(receiver)
with patch('pydispatch.dispatcher.connect', new=mock_connect):
yield from async_setup_component(hass, 'zwave', {'zwave': {
'new_entity_ids': True,
}})
yield from async_setup_component(hass, 'zwave', {'zwave': {}})
assert len(mock_receivers) == 1
@@ -380,9 +371,7 @@ def test_network_ready(hass, mock_openzwave):
mock_receivers.append(receiver)
with patch('pydispatch.dispatcher.connect', new=mock_connect):
yield from async_setup_component(hass, 'zwave', {'zwave': {
'new_entity_ids': True,
}})
yield from async_setup_component(hass, 'zwave', {'zwave': {}})
assert len(mock_receivers) == 1
@@ -409,9 +398,7 @@ def test_network_complete(hass, mock_openzwave):
mock_receivers.append(receiver)
with patch('pydispatch.dispatcher.connect', new=mock_connect):
yield from async_setup_component(hass, 'zwave', {'zwave': {
'new_entity_ids': True,
}})
yield from async_setup_component(hass, 'zwave', {'zwave': {}})
assert len(mock_receivers) == 1
@@ -441,9 +428,7 @@ class TestZWaveDeviceEntityValues(unittest.TestCase):
self.hass = get_test_home_assistant()
self.hass.start()
setup_component(self.hass, 'zwave', {'zwave': {
'new_entity_ids': True,
}})
setup_component(self.hass, 'zwave', {'zwave': {}})
self.hass.block_till_done()
self.node = MockNode()
@@ -472,9 +457,7 @@ class TestZWaveDeviceEntityValues(unittest.TestCase):
command_class='mock_bad_class', node=self.node)
self.entity_id = 'mock_component.mock_node_mock_value'
self.zwave_config = {'zwave': {
'new_entity_ids': True,
}}
self.zwave_config = {'zwave': {}}
self.device_config = {self.entity_id: {}}
def tearDown(self): # pylint: disable=invalid-name
@@ -781,9 +764,7 @@ class TestZWaveServices(unittest.TestCase):
self.hass.start()
# Initialize zwave
setup_component(self.hass, 'zwave', {'zwave': {
'new_entity_ids': True,
}})
setup_component(self.hass, 'zwave', {'zwave': {}})
self.hass.block_till_done()
self.zwave_network = self.hass.data[DATA_NETWORK]
self.zwave_network.state = MockNetwork.STATE_READY
+4 -8
View File
@@ -43,7 +43,7 @@ def test_node_event_activated(hass, mock_openzwave):
node = mock_zwave.MockNode(node_id=11)
with patch('pydispatch.dispatcher.connect', new=mock_connect):
entity = node_entity.ZWaveNodeEntity(node, mock_openzwave, True)
entity = node_entity.ZWaveNodeEntity(node, mock_openzwave)
assert len(mock_receivers) == 1
@@ -86,7 +86,7 @@ def test_scene_activated(hass, mock_openzwave):
node = mock_zwave.MockNode(node_id=11)
with patch('pydispatch.dispatcher.connect', new=mock_connect):
entity = node_entity.ZWaveNodeEntity(node, mock_openzwave, True)
entity = node_entity.ZWaveNodeEntity(node, mock_openzwave)
assert len(mock_receivers) == 1
@@ -129,7 +129,7 @@ def test_central_scene_activated(hass, mock_openzwave):
node = mock_zwave.MockNode(node_id=11)
with patch('pydispatch.dispatcher.connect', new=mock_connect):
entity = node_entity.ZWaveNodeEntity(node, mock_openzwave, True)
entity = node_entity.ZWaveNodeEntity(node, mock_openzwave)
assert len(mock_receivers) == 1
@@ -185,7 +185,7 @@ class TestZWaveNodeEntity(unittest.TestCase):
self.node.manufacturer_name = 'Test Manufacturer'
self.node.product_name = 'Test Product'
self.entity = node_entity.ZWaveNodeEntity(self.node,
self.zwave_network, True)
self.zwave_network)
def test_network_node_changed_from_value(self):
"""Test for network_node_changed."""
@@ -226,8 +226,6 @@ class TestZWaveNodeEntity(unittest.TestCase):
{'node_id': self.node.node_id,
'node_name': 'Mock Node',
'manufacturer_name': 'Test Manufacturer',
'old_entity_id': 'zwave.mock_node_567',
'new_entity_id': 'zwave.mock_node',
'product_name': 'Test Product'},
self.entity.device_state_attributes)
@@ -286,8 +284,6 @@ class TestZWaveNodeEntity(unittest.TestCase):
{'node_id': self.node.node_id,
'node_name': 'Mock Node',
'manufacturer_name': 'Test Manufacturer',
'old_entity_id': 'zwave.mock_node_567',
'new_entity_id': 'zwave.mock_node',
'product_name': 'Test Product',
'query_stage': 'Dynamic',
'is_awake': True,