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

Store the correct context in the trace (#47785)

Browse Source
This commit is contained in:
Paulus Schoutsen 2021-03-11 23:12:26 -08:00 committed by GitHub
parent fa0c544bf5
commit 2a22c54fcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/components/automation/__init__.py
View File

@ -390,8 +390,12 @@ class AutomationEntity(ToggleEntity, RestoreEntity):
reason = f' by {run_variables["trigger"]["description"]}' reason = f' by {run_variables["trigger"]["description"]}'
self._logger.debug("Automation triggered%s", reason) self._logger.debug("Automation triggered%s", reason)
# Create a new context referring to the old context.
parent_id = None if context is None else context.id
trigger_context = Context(parent_id=parent_id)
with trace_automation( with trace_automation(
self.hass, self.unique_id, self._raw_config, context self.hass, self.unique_id, self._raw_config, trigger_context
) as automation_trace: ) as automation_trace:
if self._variables: if self._variables:
try: try:
@ -421,10 +425,6 @@ class AutomationEntity(ToggleEntity, RestoreEntity):
# Prepare tracing the execution of the automation's actions # Prepare tracing the execution of the automation's actions
automation_trace.set_action_trace(trace_get()) automation_trace.set_action_trace(trace_get())
# Create a new context referring to the old context.
parent_id = None if context is None else context.id
trigger_context = Context(parent_id=parent_id)
self.async_set_context(trigger_context) self.async_set_context(trigger_context)
event_data = { event_data = {
ATTR_NAME: self._name, ATTR_NAME: self._name,

5
tests/components/automation/test_websocket_api.py
View File

@ -3,6 +3,7 @@ from unittest.mock import patch
from homeassistant.bootstrap import async_setup_component from homeassistant.bootstrap import async_setup_component
from homeassistant.components import automation, config from homeassistant.components import automation, config
from homeassistant.core import Context
from tests.common import assert_lists_same from tests.common import assert_lists_same
from tests.components.blueprint.conftest import stub_blueprint_populate # noqa: F401 from tests.components.blueprint.conftest import stub_blueprint_populate # noqa: F401
@ -52,7 +53,8 @@ async def test_get_automation_trace(hass, hass_ws_client):
client = await hass_ws_client() client = await hass_ws_client()
# Trigger "sun" automation # Trigger "sun" automation
hass.bus.async_fire("test_event") context = Context()
hass.bus.async_fire("test_event", context=context)
await hass.async_block_till_done() await hass.async_block_till_done()
# List traces # List traces
@ -73,6 +75,7 @@ async def test_get_automation_trace(hass, hass_ws_client):
response = await client.receive_json() response = await client.receive_json()
assert response["success"] assert response["success"]
trace = response["result"] trace = response["result"]
assert trace["context"]["parent_id"] == context.id
assert len(trace["action_trace"]) == 1 assert len(trace["action_trace"]) == 1
assert len(trace["action_trace"]["action/0"]) == 1 assert len(trace["action_trace"]["action/0"]) == 1
assert trace["action_trace"]["action/0"][0]["error"] assert trace["action_trace"]["action/0"][0]["error"]