jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-16 17:57:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix setting timestamp on input_datetime (#44274)

Browse Source
This commit is contained in:
Paulus Schoutsen 2020-12-16 11:18:50 +01:00 committed by GitHub
parent dfde403937
commit 4f9d5792ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/input_datetime/__init__.py
View File

@ -365,9 +365,7 @@ class InputDatetime(RestoreEntity):
def async_set_datetime(self, date=None, time=None, datetime=None, timestamp=None): def async_set_datetime(self, date=None, time=None, datetime=None, timestamp=None):
"""Set a new date / time.""" """Set a new date / time."""
if timestamp: if timestamp:
datetime = dt_util.as_local(dt_util.utc_from_timestamp(timestamp)).replace( datetime = dt_util.as_local(dt_util.utc_from_timestamp(timestamp))
tzinfo=None
)
if datetime: if datetime:
date = datetime.date() date = datetime.date()
@ -388,8 +386,8 @@ class InputDatetime(RestoreEntity):
if not time: if not time:
time = self._current_datetime.time() time = self._current_datetime.time()
self._current_datetime = py_datetime.datetime.combine(date, time).replace( self._current_datetime = dt_util.DEFAULT_TIME_ZONE.localize(
tzinfo=dt_util.DEFAULT_TIME_ZONE py_datetime.datetime.combine(date, time)
) )
self.async_write_ha_state() self.async_write_ha_state()

28
tests/components/input_datetime/test_init.py
View File

@ -697,6 +697,15 @@ async def test_timestamp(hass):
).strftime(FMT_DATETIME) ).strftime(FMT_DATETIME)
== "2020-12-13 10:00:00" == "2020-12-13 10:00:00"
) )
# Use datetime.datetime.fromtimestamp
assert (
dt_util.as_local(
datetime.datetime.fromtimestamp(
state_without_tz.attributes[ATTR_TIMESTAMP]
)
).strftime(FMT_DATETIME)
== "2020-12-13 10:00:00"
)
# Test initial time sets timestamp correctly. # Test initial time sets timestamp correctly.
state_time = hass.states.get("input_datetime.test_time_initial") state_time = hass.states.get("input_datetime.test_time_initial")
@ -704,5 +713,24 @@ async def test_timestamp(hass):
assert state_time.state == "10:00:00" assert state_time.state == "10:00:00"
assert state_time.attributes[ATTR_TIMESTAMP] == 10 * 60 * 60 assert state_time.attributes[ATTR_TIMESTAMP] == 10 * 60 * 60
# Test that setting the timestamp of an entity works.
await hass.services.async_call(
DOMAIN,
"set_datetime",
{
ATTR_ENTITY_ID: "input_datetime.test_datetime_initial_with_tz",
ATTR_TIMESTAMP: state_without_tz.attributes[ATTR_TIMESTAMP],
},
blocking=True,
)
state_with_tz_updated = hass.states.get(
"input_datetime.test_datetime_initial_with_tz"
)
assert state_with_tz_updated.state == "2020-12-13 10:00:00"
assert (
state_with_tz_updated.attributes[ATTR_TIMESTAMP]
== state_without_tz.attributes[ATTR_TIMESTAMP]
)
finally: finally:
dt_util.set_default_time_zone(ORIG_TIMEZONE) dt_util.set_default_time_zone(ORIG_TIMEZONE)