self-hosted/home-assistant-core
self-hosted/home-assistant-core
1
0
Fork 0
mirror of https://github.com/home-assistant/core synced 2024-10-05 17:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore automation last_triggered as datetime & fix test (#24951)

Browse source 
* Restore automation last_triggered as datetime & fix test

* last_triggered is always a string
This commit is contained in:
Phil Bruckner 2019-07-10 22:42:38 -05:00 committed by Paulus Schoutsen
parent 073327831f
commit c80683bb15
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
homeassistant/components/automation/__init__.py
View file

@ -18,7 +18,7 @@ from homeassistant.helpers.entity import ToggleEntity
from homeassistant.helpers.entity_component import EntityComponent from homeassistant.helpers.entity_component import EntityComponent
from homeassistant.helpers.restore_state import RestoreEntity from homeassistant.helpers.restore_state import RestoreEntity
from homeassistant.loader import bind_hass from homeassistant.loader import bind_hass
from homeassistant.util.dt import utcnow from homeassistant.util.dt import parse_datetime, utcnow
DOMAIN = 'automation' DOMAIN = 'automation'
ENTITY_ID_FORMAT = DOMAIN + '.{}' ENTITY_ID_FORMAT = DOMAIN + '.{}'
@ -227,7 +227,9 @@ class AutomationEntity(ToggleEntity, RestoreEntity):
state = await self.async_get_last_state() state = await self.async_get_last_state()
if state: if state:
enable_automation = state.state == STATE_ON enable_automation = state.state == STATE_ON
self._last_triggered = state.attributes.get('last_triggered') last_triggered = state.attributes.get('last_triggered')
if last_triggered is not None:
self._last_triggered = parse_datetime(last_triggered)
_LOGGER.debug("Loaded automation %s with state %s from state " _LOGGER.debug("Loaded automation %s with state %s from state "
" storage last state %s", self.entity_id, " storage last state %s", self.entity_id,
enable_automation, state) enable_automation, state)

13
tests/common.py
View file

@ -28,9 +28,11 @@ from homeassistant.const import (
ATTR_DISCOVERED, ATTR_SERVICE, DEVICE_DEFAULT_NAME, ATTR_DISCOVERED, ATTR_SERVICE, DEVICE_DEFAULT_NAME,
EVENT_HOMEASSISTANT_CLOSE, EVENT_PLATFORM_DISCOVERED, EVENT_STATE_CHANGED, EVENT_HOMEASSISTANT_CLOSE, EVENT_PLATFORM_DISCOVERED, EVENT_STATE_CHANGED,
EVENT_TIME_CHANGED, SERVER_PORT, STATE_ON, STATE_OFF) EVENT_TIME_CHANGED, SERVER_PORT, STATE_ON, STATE_OFF)
from homeassistant.core import State
from homeassistant.helpers import ( from homeassistant.helpers import (
area_registry, device_registry, entity, entity_platform, entity_registry, area_registry, device_registry, entity, entity_platform, entity_registry,
intent, restore_state, storage) intent, restore_state, storage)
from homeassistant.helpers.json import JSONEncoder
from homeassistant.setup import async_setup_component, setup_component from homeassistant.setup import async_setup_component, setup_component
from homeassistant.util.unit_system import METRIC_SYSTEM from homeassistant.util.unit_system import METRIC_SYSTEM
from homeassistant.util.async_ import ( from homeassistant.util.async_ import (
@ -761,9 +763,14 @@ def mock_restore_cache(hass, states):
data = restore_state.RestoreStateData(hass) data = restore_state.RestoreStateData(hass)
now = date_util.utcnow() now = date_util.utcnow()
data.last_states = { last_states = {}
state.entity_id: restore_state.StoredState(state, now) for state in states:
for state in states} restored_state = state.as_dict()
restored_state['attributes'] = json.loads(json.dumps(
restored_state['attributes'], cls=JSONEncoder))
last_states[state.entity_id] = restore_state.StoredState(
State.from_dict(restored_state), now)
data.last_states = last_states
_LOGGER.debug('Restore cache: %s', data.last_states) _LOGGER.debug('Restore cache: %s', data.last_states)
assert len(data.last_states) == len(states), \ assert len(data.last_states) == len(states), \
"Duplicate entity_id? {}".format(states) "Duplicate entity_id? {}".format(states)