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

Restores switch state, case the switch is optimistic (#14151)

Browse source 
* Add restore_state to optimistic switch

* no need to schedule update

* test added

* lint

* new async syntax

* lint
This commit is contained in:
Diogo Gomes 2018-05-02 22:29:07 +01:00 • committed by Paulus Schoutsen
parent 64b9fbd8d9
commit c851dfa2c7
2 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
homeassistant/components/switch/mqtt.py
View file

@ -16,9 +16,10 @@ from homeassistant.components.mqtt import (
from homeassistant.components.switch import SwitchDevice from homeassistant.components.switch import SwitchDevice
from homeassistant.const import ( from homeassistant.const import (
CONF_NAME, CONF_OPTIMISTIC, CONF_VALUE_TEMPLATE, CONF_PAYLOAD_OFF, CONF_NAME, CONF_OPTIMISTIC, CONF_VALUE_TEMPLATE, CONF_PAYLOAD_OFF,
CONF_PAYLOAD_ON, CONF_ICON) CONF_PAYLOAD_ON, CONF_ICON, STATE_ON)
import homeassistant.components.mqtt as mqtt import homeassistant.components.mqtt as mqtt
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.restore_state import async_get_last_state
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -112,6 +113,12 @@ class MqttSwitch(MqttAvailability, SwitchDevice):
self.hass, self._state_topic, state_message_received, self.hass, self._state_topic, state_message_received,
self._qos) self._qos)
if self._optimistic:
last_state = await async_get_last_state(self.hass,
self.entity_id)
if last_state:
self._state = last_state.state == STATE_ON
@property @property
def should_poll(self): def should_poll(self):
"""Return the polling state.""" """Return the polling state."""

10
tests/components/switch/test_mqtt.py
View file

@ -1,12 +1,14 @@
"""The tests for the MQTT switch platform.""" """The tests for the MQTT switch platform."""
import unittest import unittest
from unittest.mock import patch
from homeassistant.setup import setup_component from homeassistant.setup import setup_component
from homeassistant.const import STATE_ON, STATE_OFF, STATE_UNAVAILABLE,\ from homeassistant.const import STATE_ON, STATE_OFF, STATE_UNAVAILABLE,\
ATTR_ASSUMED_STATE ATTR_ASSUMED_STATE
import homeassistant.core as ha
import homeassistant.components.switch as switch import homeassistant.components.switch as switch
from tests.common import ( from tests.common import (
mock_mqtt_component, fire_mqtt_message, get_test_home_assistant) mock_mqtt_component, fire_mqtt_message, get_test_home_assistant, mock_coro)
class TestSwitchMQTT(unittest.TestCase): class TestSwitchMQTT(unittest.TestCase):
@ -52,6 +54,10 @@ class TestSwitchMQTT(unittest.TestCase):
def test_sending_mqtt_commands_and_optimistic(self): def test_sending_mqtt_commands_and_optimistic(self):
"""Test the sending MQTT commands in optimistic mode.""" """Test the sending MQTT commands in optimistic mode."""
fake_state = ha.State('switch.test', 'on')
with patch('homeassistant.components.switch.mqtt.async_get_last_state',
return_value=mock_coro(fake_state)):
assert setup_component(self.hass, switch.DOMAIN, { assert setup_component(self.hass, switch.DOMAIN, {
switch.DOMAIN: { switch.DOMAIN: {
'platform': 'mqtt', 'platform': 'mqtt',
@ -64,7 +70,7 @@ class TestSwitchMQTT(unittest.TestCase):
}) })
state = self.hass.states.get('switch.test') state = self.hass.states.get('switch.test')
self.assertEqual(STATE_OFF, state.state) self.assertEqual(STATE_ON, state.state)
self.assertTrue(state.attributes.get(ATTR_ASSUMED_STATE)) self.assertTrue(state.attributes.get(ATTR_ASSUMED_STATE))
switch.turn_on(self.hass, 'switch.test') switch.turn_on(self.hass, 'switch.test')