jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-08 05:47:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix converting config device tracker

Browse Source
This commit is contained in:
Paulus Schoutsen 2015-09-13 00:48:52 -07:00
parent 134c870d2b
commit eef1e65244
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,8 +335,8 @@ def convert_csv_config(csv_path, yaml_path):
used_ids = set() used_ids = set()
with open(csv_path) as inp: with open(csv_path) as inp:
for row in csv.DictReader(inp): for row in csv.DictReader(inp):
dev_id = util.ensure_unique_string(util.slugify(row['name']), dev_id = util.ensure_unique_string(
used_ids) util.slugify(row['name']) or DEVICE_DEFAULT_NAME, used_ids)
used_ids.add(dev_id) used_ids.add(dev_id)
device = Device(None, None, row['track'] == '1', dev_id, device = Device(None, None, row['track'] == '1', dev_id,
row['device'], row['name'], row['picture']) row['device'], row['name'], row['picture'])

10
tests/components/device_tracker/test_init.py
View File

@ -15,7 +15,7 @@ from homeassistant.loader import get_component
import homeassistant.util.dt as dt_util import homeassistant.util.dt as dt_util
from homeassistant.const import ( from homeassistant.const import (
ATTR_ENTITY_ID, ATTR_ENTITY_PICTURE, ATTR_FRIENDLY_NAME, ATTR_HIDDEN, ATTR_ENTITY_ID, ATTR_ENTITY_PICTURE, ATTR_FRIENDLY_NAME, ATTR_HIDDEN,
STATE_HOME, STATE_NOT_HOME, CONF_PLATFORM, ) STATE_HOME, STATE_NOT_HOME, CONF_PLATFORM, DEVICE_DEFAULT_NAME)
import homeassistant.components.device_tracker as device_tracker import homeassistant.components.device_tracker as device_tracker
from tests.common import ( from tests.common import (
@ -65,7 +65,7 @@ class TestComponentsDeviceTracker(unittest.TestCase):
} }
person2 = { person2 = {
'mac': 'MN:OP:QR:ST:UV:WX:YZ', 'mac': 'MN:OP:QR:ST:UV:WX:YZ',
'name': 'Anne Therese', 'name': '',
'track': False, 'track': False,
'picture': None, 'picture': None,
} }
@ -87,9 +87,11 @@ class TestComponentsDeviceTracker(unittest.TestCase):
self.assertEqual(2, len(yaml_config)) self.assertEqual(2, len(yaml_config))
for pers, yaml_pers in zip( for pers, yaml_pers in zip(
(person2, person1), sorted(yaml_config.values(), (person1, person2), sorted(yaml_config.values(),
key=lambda pers: pers['name'])): key=lambda pers: pers['mac'])):
for key, value in pers.items(): for key, value in pers.items():
if key == 'name' and value == '':
value = DEVICE_DEFAULT_NAME
self.assertEqual(value, yaml_pers.get(key)) self.assertEqual(value, yaml_pers.get(key))
finally: finally: