home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-08-04 21:25:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed proximity zone incorrectly using name instead of zone setting. (#5862)

Browse Source 
* Fixed proximity zone incorrectly using name instead of zone setting.

* Fixed proximity tests to suit change.
This commit is contained in:
Jose Juan Montes
2017-02-12 20:03:53 +01:00
committed by Paulus Schoutsen
parent f8be731891
commit 2103bfc824
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/proximity.py
View File

@@ -63,7 +63,7 @@ def setup_proximity_component(hass, name, config):
proximity_zone = name proximity_zone = name
unit_of_measurement = config.get( unit_of_measurement = config.get(
CONF_UNIT_OF_MEASUREMENT, hass.config.units.length_unit) CONF_UNIT_OF_MEASUREMENT, hass.config.units.length_unit)
zone_id = 'zone.{}'.format(proximity_zone) zone_id = 'zone.{}'.format(config.get(CONF_ZONE))
proximity = Proximity(hass, proximity_zone, DEFAULT_DIST_TO_ZONE, proximity = Proximity(hass, proximity_zone, DEFAULT_DIST_TO_ZONE,
DEFAULT_DIR_OF_TRAVEL, DEFAULT_NEAREST, DEFAULT_DIR_OF_TRAVEL, DEFAULT_NEAREST,

17
tests/components/test_proximity.py
View File

@@ -394,6 +394,7 @@ class TestProximity(unittest.TestCase):
'device_tracker.test2' 'device_tracker.test2'
], ],
'tolerance': '1', 'tolerance': '1',
'zone': 'home'
} }
} }
}) })
@@ -445,7 +446,9 @@ class TestProximity(unittest.TestCase):
'devices': [ 'devices': [
'device_tracker.test1', 'device_tracker.test1',
'device_tracker.test2' 'device_tracker.test2'
] ],
'zone': 'home'
} }
} }
}) })
@@ -497,7 +500,8 @@ class TestProximity(unittest.TestCase):
'devices': [ 'devices': [
'device_tracker.test1', 'device_tracker.test1',
'device_tracker.test2' 'device_tracker.test2'
] ],
'zone': 'home'
} }
} }
}) })
@@ -538,7 +542,8 @@ class TestProximity(unittest.TestCase):
'devices': [ 'devices': [
'device_tracker.test1', 'device_tracker.test1',
'device_tracker.test2' 'device_tracker.test2'
] ],
'zone': 'home'
} }
} }
}) })
@@ -601,7 +606,8 @@ class TestProximity(unittest.TestCase):
'devices': [ 'devices': [
'device_tracker.test1' 'device_tracker.test1'
], ],
'tolerance': 1000 'tolerance': 1000,
'zone': 'home'
} }
} }
}) })
@@ -654,7 +660,8 @@ class TestProximity(unittest.TestCase):
'devices': [ 'devices': [
'device_tracker.test1', 'device_tracker.test1',
'device_tracker.test2' 'device_tracker.test2'
] ],
'zone': 'home'
} }
} }
}) })