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

Trying to fix failing sun component tests. (#1741)

Browse source 
Make sure we set a timezone to make UTC calculations predictable
and don't override the location of the test_home_assistant config.
This commit is contained in:
Jan Harkes 2016-04-07 21:32:21 -04:00 • committed by Paulus Schoutsen
parent a7f80608c6
commit 9e0e61fec9
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/common.py
View file

@ -6,10 +6,11 @@ from unittest import mock
from homeassistant import core as ha, loader from homeassistant import core as ha, loader
from homeassistant.bootstrap import _setup_component from homeassistant.bootstrap import _setup_component
from homeassistant.helpers.entity import ToggleEntity from homeassistant.helpers.entity import ToggleEntity
import homeassistant.util.dt as date_util
from homeassistant.const import ( from homeassistant.const import (
STATE_ON, STATE_OFF, DEVICE_DEFAULT_NAME, EVENT_TIME_CHANGED, STATE_ON, STATE_OFF, DEVICE_DEFAULT_NAME, EVENT_TIME_CHANGED,
EVENT_STATE_CHANGED, EVENT_PLATFORM_DISCOVERED, ATTR_SERVICE, EVENT_STATE_CHANGED, EVENT_PLATFORM_DISCOVERED, ATTR_SERVICE,
ATTR_DISCOVERED, SERVER_PORT) ATTR_DISCOVERED, SERVER_PORT, TEMP_CELCIUS)
from homeassistant.components import sun, mqtt from homeassistant.components import sun, mqtt
_TEST_INSTANCE_PORT = SERVER_PORT _TEST_INSTANCE_PORT = SERVER_PORT
@ -34,6 +35,8 @@ def get_test_home_assistant(num_threads=None):
hass.config.config_dir = get_test_config_dir() hass.config.config_dir = get_test_config_dir()
hass.config.latitude = 32.87336 hass.config.latitude = 32.87336
hass.config.longitude = -117.22743 hass.config.longitude = -117.22743
hass.config.time_zone = date_util.get_time_zone('US/Pacific')
hass.config.temperature_unit = TEMP_CELCIUS
if 'custom_components.test' not in loader.AVAILABLE_COMPONENTS: if 'custom_components.test' not in loader.AVAILABLE_COMPONENTS:
loader.prepare(hass) loader.prepare(hass)

11
tests/components/test_sun.py
View file

@ -32,17 +32,14 @@ class TestSun(unittest.TestCase):
def test_setting_rising(self): def test_setting_rising(self):
"""Test retrieving sun setting and rising.""" """Test retrieving sun setting and rising."""
latitude = 32.87336
longitude = 117.22743
# Compare it with the real data
self.hass.config.latitude = latitude
self.hass.config.longitude = longitude
sun.setup(self.hass, {sun.DOMAIN: {sun.CONF_ELEVATION: 0}}) sun.setup(self.hass, {sun.DOMAIN: {sun.CONF_ELEVATION: 0}})
astral = Astral() astral = Astral()
utc_now = dt_util.utcnow() utc_now = dt_util.utcnow()
latitude = self.hass.config.latitude
longitude = self.hass.config.longitude
mod = -1 mod = -1
while True: while True:
next_rising = (astral.sunrise_utc(utc_now + next_rising = (astral.sunrise_utc(utc_now +
@ -73,8 +70,6 @@ class TestSun(unittest.TestCase):
def test_state_change(self): def test_state_change(self):
"""Test if the state changes at next setting/rising.""" """Test if the state changes at next setting/rising."""
self.hass.config.latitude = '32.87336'
self.hass.config.longitude = '117.22743'
sun.setup(self.hass, {sun.DOMAIN: {sun.CONF_ELEVATION: 0}}) sun.setup(self.hass, {sun.DOMAIN: {sun.CONF_ELEVATION: 0}})
if sun.is_on(self.hass): if sun.is_on(self.hass):