1
0
mirror of https://github.com/home-assistant/core.git synced 2025-12-24 21:06:19 +00:00

add_devices -> add_entities (#16171)

* add_devices -> add_entities

* Lint

* PyLint

* Revert external method in scsgate
This commit is contained in:
Paulus Schoutsen
2018-08-24 16:37:30 +02:00
committed by GitHub
parent 37fd438717
commit 994b829cb4
839 changed files with 2121 additions and 2008 deletions

View File

@@ -45,17 +45,17 @@ class TestNX584SensorSetup(unittest.TestCase):
@mock.patch('homeassistant.components.binary_sensor.nx584.NX584ZoneSensor')
def test_setup_defaults(self, mock_nx, mock_watcher):
"""Test the setup with no configuration."""
add_devices = mock.MagicMock()
add_entities = mock.MagicMock()
config = {
'host': nx584.DEFAULT_HOST,
'port': nx584.DEFAULT_PORT,
'exclude_zones': [],
'zone_types': {},
}
self.assertTrue(nx584.setup_platform(self.hass, config, add_devices))
self.assertTrue(nx584.setup_platform(self.hass, config, add_entities))
mock_nx.assert_has_calls(
[mock.call(zone, 'opening') for zone in self.fake_zones])
self.assertTrue(add_devices.called)
self.assertTrue(add_entities.called)
self.assertEqual(nx584_client.Client.call_count, 1)
self.assertEqual(
nx584_client.Client.call_args, mock.call('http://localhost:5007')
@@ -71,13 +71,13 @@ class TestNX584SensorSetup(unittest.TestCase):
'exclude_zones': [2],
'zone_types': {3: 'motion'},
}
add_devices = mock.MagicMock()
self.assertTrue(nx584.setup_platform(self.hass, config, add_devices))
add_entities = mock.MagicMock()
self.assertTrue(nx584.setup_platform(self.hass, config, add_entities))
mock_nx.assert_has_calls([
mock.call(self.fake_zones[0], 'opening'),
mock.call(self.fake_zones[2], 'motion'),
])
self.assertTrue(add_devices.called)
self.assertTrue(add_entities.called)
self.assertEqual(nx584_client.Client.call_count, 1)
self.assertEqual(
nx584_client.Client.call_args, mock.call('http://foo:123')
@@ -120,9 +120,9 @@ class TestNX584SensorSetup(unittest.TestCase):
def test_setup_no_zones(self):
"""Test the setup with no zones."""
nx584_client.Client.return_value.list_zones.return_value = []
add_devices = mock.MagicMock()
self.assertTrue(nx584.setup_platform(self.hass, {}, add_devices))
self.assertFalse(add_devices.called)
add_entities = mock.MagicMock()
self.assertTrue(nx584.setup_platform(self.hass, {}, add_entities))
self.assertFalse(add_entities.called)
class TestNX584ZoneSensor(unittest.TestCase):

View File

@@ -16,7 +16,7 @@ class TestRingBinarySensorSetup(unittest.TestCase):
DEVICES = []
def add_devices(self, devices, action):
def add_entities(self, devices, action):
"""Mock add devices."""
for device in devices:
self.DEVICES.append(device)
@@ -58,7 +58,7 @@ class TestRingBinarySensorSetup(unittest.TestCase):
base_ring.setup(self.hass, VALID_CONFIG)
ring.setup_platform(self.hass,
self.config,
self.add_devices,
self.add_entities,
None)
for device in self.DEVICES:

View File

@@ -16,7 +16,7 @@ class TestSleepIQBinarySensorSetup(unittest.TestCase):
DEVICES = []
def add_devices(self, devices):
def add_entities(self, devices):
"""Mock add devices."""
for device in devices:
self.DEVICES.append(device)
@@ -45,7 +45,7 @@ class TestSleepIQBinarySensorSetup(unittest.TestCase):
sleepiq.setup_platform(self.hass,
self.config,
self.add_devices,
self.add_entities,
MagicMock())
self.assertEqual(2, len(self.DEVICES))

View File

@@ -54,7 +54,7 @@ def test_setup_platform(hass):
yield from spc.async_setup_platform(hass=hass,
config={},
async_add_devices=add_entities,
async_add_entities=add_entities,
discovery_info=zones)
assert len(added_entities) == 3

View File

@@ -38,13 +38,13 @@ class TestTCPBinarySensor(unittest.TestCase):
@patch('homeassistant.components.sensor.tcp.TcpSensor.update')
def test_setup_platform_devices(self, mock_update):
"""Check the supplied config and call add_devices with sensor."""
add_devices = Mock()
ret = bin_tcp.setup_platform(None, test_tcp.TEST_CONFIG, add_devices)
"""Check the supplied config and call add_entities with sensor."""
add_entities = Mock()
ret = bin_tcp.setup_platform(None, test_tcp.TEST_CONFIG, add_entities)
assert ret is None
assert add_devices.called
assert add_entities.called
assert isinstance(
add_devices.call_args[0][0][0], bin_tcp.TcpBinarySensor)
add_entities.call_args[0][0][0], bin_tcp.TcpBinarySensor)
@patch('homeassistant.components.sensor.tcp.TcpSensor.update')
def test_is_on_true(self, mock_update):

View File

@@ -26,7 +26,7 @@ class TestVultrBinarySensorSetup(unittest.TestCase):
DEVICES = []
def add_devices(self, devices, action):
def add_entities(self, devices, action):
"""Mock add devices."""
for device in devices:
self.DEVICES.append(device)
@@ -71,7 +71,7 @@ class TestVultrBinarySensorSetup(unittest.TestCase):
for config in self.configs:
vultr.setup_platform(self.hass,
config,
self.add_devices,
self.add_entities,
None)
self.assertEqual(len(self.DEVICES), 3)
@@ -147,7 +147,7 @@ class TestVultrBinarySensorSetup(unittest.TestCase):
no_subs_setup = vultr.setup_platform(self.hass,
bad_conf,
self.add_devices,
self.add_entities,
None)
self.assertFalse(no_subs_setup)
@@ -159,7 +159,7 @@ class TestVultrBinarySensorSetup(unittest.TestCase):
wrong_subs_setup = vultr.setup_platform(self.hass,
bad_conf,
self.add_devices,
self.add_entities,
None)
self.assertFalse(wrong_subs_setup)