evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix TCP sensor to correctly use value_template (#5211)

Browse source 
* Fix TCP sensor to correctly use value_template

* Fix TCP component tests

* Update tcp.py
This commit is contained in:
Andrew Williams 2017-01-11 16:26:29 +00:00 • committed by Paulus Schoutsen
parent 3f3a3bcc8a
commit 1cf9ae5a01
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
homeassistant/components/sensor/tcp.py
View file

@ -16,7 +16,6 @@ from homeassistant.const import (
CONF_UNIT_OF_MEASUREMENT, CONF_VALUE_TEMPLATE) CONF_UNIT_OF_MEASUREMENT, CONF_VALUE_TEMPLATE)
from homeassistant.exceptions import TemplateError from homeassistant.exceptions import TemplateError
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
from homeassistant.helpers.template import Template
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -57,7 +56,7 @@ class TcpSensor(Entity):
value_template = config.get(CONF_VALUE_TEMPLATE) value_template = config.get(CONF_VALUE_TEMPLATE)
if value_template is not None: if value_template is not None:
value_template = Template(value_template, hass) value_template.hass = hass
self._hass = hass self._hass = hass
self._config = { self._config = {

7
tests/components/sensor/test_tcp.py
View file

@ -9,6 +9,7 @@ from tests.common import (get_test_home_assistant, assert_setup_component)
from homeassistant.bootstrap import setup_component from homeassistant.bootstrap import setup_component
from homeassistant.components.sensor import tcp from homeassistant.components.sensor import tcp
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
from homeassistant.helpers.template import Template
TEST_CONFIG = { TEST_CONFIG = {
'sensor': { 'sensor': {
@ -19,7 +20,7 @@ TEST_CONFIG = {
tcp.CONF_TIMEOUT: tcp.DEFAULT_TIMEOUT + 1, tcp.CONF_TIMEOUT: tcp.DEFAULT_TIMEOUT + 1,
tcp.CONF_PAYLOAD: 'test_payload', tcp.CONF_PAYLOAD: 'test_payload',
tcp.CONF_UNIT_OF_MEASUREMENT: 'test_unit', tcp.CONF_UNIT_OF_MEASUREMENT: 'test_unit',
tcp.CONF_VALUE_TEMPLATE: 'test_template', tcp.CONF_VALUE_TEMPLATE: Template('test_template'),
tcp.CONF_VALUE_ON: 'test_on', tcp.CONF_VALUE_ON: 'test_on',
tcp.CONF_BUFFER_SIZE: tcp.DEFAULT_BUFFER_SIZE + 1 tcp.CONF_BUFFER_SIZE: tcp.DEFAULT_BUFFER_SIZE + 1
}, },
@ -252,7 +253,7 @@ class TestTCPSensor(unittest.TestCase):
mock_socket = mock_socket().__enter__() mock_socket = mock_socket().__enter__()
mock_socket.recv.return_value = test_value.encode() mock_socket.recv.return_value = test_value.encode()
config = copy(TEST_CONFIG['sensor']) config = copy(TEST_CONFIG['sensor'])
config[tcp.CONF_VALUE_TEMPLATE] = '{{ value }} {{ 1+1 }}' config[tcp.CONF_VALUE_TEMPLATE] = Template('{{ value }} {{ 1+1 }}')
sensor = tcp.TcpSensor(self.hass, config) sensor = tcp.TcpSensor(self.hass, config)
assert sensor._state == '%s 2' % test_value assert sensor._state == '%s 2' % test_value
@ -265,6 +266,6 @@ class TestTCPSensor(unittest.TestCase):
mock_socket = mock_socket().__enter__() mock_socket = mock_socket().__enter__()
mock_socket.recv.return_value = test_value.encode() mock_socket.recv.return_value = test_value.encode()
config = copy(TEST_CONFIG['sensor']) config = copy(TEST_CONFIG['sensor'])
config[tcp.CONF_VALUE_TEMPLATE] = "{{ this won't work" config[tcp.CONF_VALUE_TEMPLATE] = Template("{{ this won't work")
sensor = tcp.TcpSensor(self.hass, config) sensor = tcp.TcpSensor(self.hass, config)
assert sensor.update() is None assert sensor.update() is None