evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix zones (#3413)

Browse source
This commit is contained in:
Paulus Schoutsen 2016-09-15 19:40:18 -07:00 • committed by GitHub
parent 0a6f496425
commit c23ad3e285
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
homeassistant/components/zone.py
View file

@ -37,16 +37,15 @@ ICON_IMPORT = 'mdi:import'
STATE = 'zoning'
CONFIG_SCHEMA = vol.Schema({
DOMAIN: vol.Schema({
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Required(CONF_LATITUDE): cv.latitude,
vol.Required(CONF_LONGITUDE): cv.longitude,
vol.Optional(CONF_RADIUS, default=DEFAULT_RADIUS): vol.Coerce(float),
vol.Optional(CONF_PASSIVE, default=DEFAULT_PASSIVE): cv.boolean,
vol.Optional(CONF_ICON): cv.icon,
}),
}, extra=vol.ALLOW_EXTRA)
# The config that zone accepts is the same as if it has platforms.
PLATFORM_SCHEMA = vol.Schema({
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Required(CONF_LATITUDE): cv.latitude,
vol.Required(CONF_LONGITUDE): cv.longitude,
vol.Optional(CONF_RADIUS, default=DEFAULT_RADIUS): vol.Coerce(float),
vol.Optional(CONF_PASSIVE, default=DEFAULT_PASSIVE): cv.boolean,
vol.Optional(CONF_ICON): cv.icon,
})
def active_zone(hass, latitude, longitude, radius=0):

15
tests/components/test_zone.py
View file

@ -1,6 +1,7 @@
"""Test zone component."""
import unittest
from homeassistant import bootstrap
from homeassistant.components import zone
from tests.common import get_test_home_assistant
@ -26,7 +27,7 @@ class TestComponentZone(unittest.TestCase):
'radius': 250,
'passive': True
}
assert zone.setup(self.hass, {
assert bootstrap.setup_component(self.hass, zone.DOMAIN, {
'zone': info
})
@ -39,7 +40,7 @@ class TestComponentZone(unittest.TestCase):
def test_active_zone_skips_passive_zones(self):
"""Test active and passive zones."""
assert zone.setup(self.hass, {
assert bootstrap.setup_component(self.hass, zone.DOMAIN, {
'zone': [
{
'name': 'Passive Zone',
@ -54,7 +55,8 @@ class TestComponentZone(unittest.TestCase):
active = zone.active_zone(self.hass, 32.880600, -117.237561)
assert active is None
assert zone.setup(self.hass, {
self.hass.config.components.remove('zone')
assert bootstrap.setup_component(self.hass, zone.DOMAIN, {
'zone': [
{
'name': 'Active Zone',
@ -72,7 +74,7 @@ class TestComponentZone(unittest.TestCase):
"""Test zone size preferences."""
latitude = 32.880600
longitude = -117.237561
assert zone.setup(self.hass, {
assert bootstrap.setup_component(self.hass, zone.DOMAIN, {
'zone': [
{
'name': 'Small Zone',
@ -92,7 +94,8 @@ class TestComponentZone(unittest.TestCase):
active = zone.active_zone(self.hass, latitude, longitude)
assert 'zone.small_zone' == active.entity_id
assert zone.setup(self.hass, {
self.hass.config.components.remove('zone')
assert bootstrap.setup_component(self.hass, zone.DOMAIN, {
'zone': [
{
'name': 'Smallest Zone',
@ -110,7 +113,7 @@ class TestComponentZone(unittest.TestCase):
"""Test working in passive zones."""
latitude = 32.880600
longitude = -117.237561
assert zone.setup(self.hass, {
assert bootstrap.setup_component(self.hass, zone.DOMAIN, {
'zone': [
{
'name': 'Passive Zone',