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

Fix script condition issue (Thanks @bart274) (#1972)

Browse Source
This commit is contained in:
Paulus Schoutsen 2016-05-03 18:19:55 -07:00
parent f2176e54ba
commit 2a972b7fe3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/helpers/script.py
View File

@ -118,7 +118,7 @@ class Script():
def _check_condition(self, action, variables): def _check_condition(self, action, variables):
"""Test if condition is matching.""" """Test if condition is matching."""
self.last_action = action.get(CONF_ALIAS, action[CONF_CONDITION]) self.last_action = action.get(CONF_ALIAS, action[CONF_CONDITION])
check = condition.from_config(action)(self.hass, False) check = condition.from_config(action)(self.hass, variables)
self._log("Test condition {}: {}".format(self.last_action, check)) self._log("Test condition {}: {}".format(self.last_action, check))
return check return check

7
tests/helpers/test_script.py
View File

@ -3,6 +3,8 @@
from datetime import timedelta from datetime import timedelta
import unittest import unittest
# Otherwise can't test just this file (import order issue)
import homeassistant.components # noqa
import homeassistant.util.dt as dt_util import homeassistant.util.dt as dt_util
from homeassistant.helpers import script from homeassistant.helpers import script
@ -233,9 +235,8 @@ class TestScriptHelper(unittest.TestCase):
script_obj = script.Script(self.hass, [ script_obj = script.Script(self.hass, [
{'event': event}, {'event': event},
{ {
'condition': 'state', 'condition': 'template',
'entity_id': 'test.entity', 'value_template': '{{ states.test.entity.state == "hello" }}',
'state': 'hello',
}, },
{'event': event}, {'event': event},
]) ])