From 7695ca2c8b189f0017556772233b1e9de658366f Mon Sep 17 00:00:00 2001 From: Egor Tsinko Date: Sun, 19 Nov 2017 20:41:30 -0700 Subject: [PATCH] Fix for time_date sensor (#10694) * fix to time_date sensor * cleaned up the code and added unit tests * fixed lint errors --- homeassistant/components/sensor/time_date.py | 2 +- tests/components/sensor/test_time_date.py | 27 ++++++++++++++++---- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/homeassistant/components/sensor/time_date.py b/homeassistant/components/sensor/time_date.py index 69723aea19a..bfdf0c3c3aa 100644 --- a/homeassistant/components/sensor/time_date.py +++ b/homeassistant/components/sensor/time_date.py @@ -90,7 +90,7 @@ class TimeDateSensor(Entity): if now is None: now = dt_util.utcnow() if self.type == 'date': - now = dt_util.start_of_local_day(now) + now = dt_util.start_of_local_day(dt_util.as_local(now)) return now + timedelta(seconds=86400) elif self.type == 'beat': interval = 86.4 diff --git a/tests/components/sensor/test_time_date.py b/tests/components/sensor/test_time_date.py index 98eb6e79428..1b3ab68988e 100644 --- a/tests/components/sensor/test_time_date.py +++ b/tests/components/sensor/test_time_date.py @@ -1,5 +1,6 @@ """The tests for Kira sensor platform.""" import unittest +from unittest.mock import patch from homeassistant.components.sensor import time_date as time_date import homeassistant.util.dt as dt_util @@ -36,11 +37,6 @@ class TestTimeDateSensor(unittest.TestCase): next_time = device.get_next_interval(now) assert next_time == dt_util.utc_from_timestamp(60) - device = time_date.TimeDateSensor(self.hass, 'date') - now = dt_util.utc_from_timestamp(12345) - next_time = device.get_next_interval(now) - assert next_time == dt_util.utc_from_timestamp(86400) - device = time_date.TimeDateSensor(self.hass, 'beat') now = dt_util.utc_from_timestamp(29) next_time = device.get_next_interval(now) @@ -89,6 +85,27 @@ class TestTimeDateSensor(unittest.TestCase): # so the second day was 18000 + 86400 assert next_time.timestamp() == 104400 + new_tz = dt_util.get_time_zone('America/Edmonton') + assert new_tz is not None + dt_util.set_default_time_zone(new_tz) + now = dt_util.parse_datetime('2017-11-13 19:47:19-07:00') + device = time_date.TimeDateSensor(self.hass, 'date') + next_time = device.get_next_interval(now) + assert (next_time.timestamp() == + dt_util.as_timestamp('2017-11-14 00:00:00-07:00')) + + @patch('homeassistant.util.dt.utcnow', + return_value=dt_util.parse_datetime('2017-11-14 02:47:19-00:00')) + def test_timezone_intervals_empty_parameter(self, _): + """Test get_interval() without parameters.""" + new_tz = dt_util.get_time_zone('America/Edmonton') + assert new_tz is not None + dt_util.set_default_time_zone(new_tz) + device = time_date.TimeDateSensor(self.hass, 'date') + next_time = device.get_next_interval() + assert (next_time.timestamp() == + dt_util.as_timestamp('2017-11-14 00:00:00-07:00')) + def test_icons(self): """Test attributes of sensors.""" device = time_date.TimeDateSensor(self.hass, 'time')