Fix MQTT retained message not being re-dispatched (#12004)
* Fix MQTT retained message not being re-dispatched * Fix tests * Use paho-mqtt for retained messages * Improve code style * Store list of subscribers * Fix lint error * Adhere to Home Assistant's logging standard "Try to avoid brackets and additional quotes around the output to make it easier for users to parse the log." - https://home-assistant.io/developers/development_guidelines/ * Add reconnect tests * Fix lint error * Introduce Subscription Tests still need to be updated * Use namedtuple for MQTT messages ... And fix issues Accessing the config manually at runtime isn't ideal * Fix MQTT __init__.py tests * Updated usage of Mocks * Moved tests that were testing subscriptions out of the MQTTComponent test, because of how mock.patch was used * Adjusted the remaining tests for the MQTT clients new behavior - e.g. self.progress was removed * Updated the async_fire_mqtt_message helper * ✅ Update MQTT tests * Re-introduce the MQTT subscriptions through the dispatcher for tests - quite ugly though... 🚧 * Update fixtures to use our new MQTT mock 🎨 * 📝 Update base code according to comments * 🔨 Adjust MQTT test base * 🔨 Update other MQTT tests * 🍎 Fix carriage return in source files Apparently test_mqtt_json.py and test_mqtt_template.py were written on Windows. In order to not mess up the diff, I'll just redo the carriage return. * 🎨 Remove unused import * 📝 Remove fire_mqtt_client_message * 🐛 Fix using python 3.6 method What's very interesting is that 3.4 didn't fail on travis... * 🐛 Fix using assert directly
This commit is contained in:
1 parent
17e5740a0c
commit
b1c0cabe6c
15 files changed
+1531
-1490
No files matched your search
+21
-13
@@ -15,7 +15,7 @@ from homeassistant import core as ha, loader
|
||||
from homeassistant.setup import setup_component, async_setup_component
|
||||
from homeassistant.config import async_process_component_config
|
||||
from homeassistant.helpers import (
|
||||
intent, dispatcher, entity, restore_state, entity_registry,
|
||||
intent, entity, restore_state, entity_registry,
|
||||
entity_platform)
|
||||
from homeassistant.util.unit_system import METRIC_SYSTEM
|
||||
import homeassistant.util.dt as date_util
|
||||
@@ -214,13 +214,12 @@ def async_mock_intent(hass, intent_typ):
|
||||
|
||||
|
||||
@ha.callback
|
||||
def async_fire_mqtt_message(hass, topic, payload, qos=0):
|
||||
def async_fire_mqtt_message(hass, topic, payload, qos=0, retain=False):
|
||||
"""Fire the MQTT message."""
|
||||
if isinstance(payload, str):
|
||||
payload = payload.encode('utf-8')
|
||||
dispatcher.async_dispatcher_send(
|
||||
hass, mqtt.SIGNAL_MQTT_MESSAGE_RECEIVED, topic,
|
||||
payload, qos)
|
||||
msg = mqtt.Message(topic, payload, qos, retain)
|
||||
hass.async_run_job(hass.data['mqtt']._mqtt_on_message, None, None, msg)
|
||||
|
||||
|
||||
fire_mqtt_message = threadsafe_callback_factory(async_fire_mqtt_message)
|
||||
@@ -293,16 +292,25 @@ def mock_http_component_app(hass, api_password=None):
|
||||
|
||||
|
||||
@asyncio.coroutine
|
||||
def async_mock_mqtt_component(hass):
|
||||
def async_mock_mqtt_component(hass, config=None):
|
||||
"""Mock the MQTT component."""
|
||||
with patch('homeassistant.components.mqtt.MQTT') as mock_mqtt:
|
||||
mock_mqtt().async_connect.return_value = mock_coro(True)
|
||||
yield from async_setup_component(hass, mqtt.DOMAIN, {
|
||||
mqtt.DOMAIN: {
|
||||
mqtt.CONF_BROKER: 'mock-broker',
|
||||
}
|
||||
if config is None:
|
||||
config = {mqtt.CONF_BROKER: 'mock-broker'}
|
||||
|
||||
with patch('paho.mqtt.client.Client') as mock_client:
|
||||
mock_client().connect.return_value = 0
|
||||
mock_client().subscribe.return_value = (0, 0)
|
||||
mock_client().publish.return_value = (0, 0)
|
||||
|
||||
result = yield from async_setup_component(hass, mqtt.DOMAIN, {
|
||||
mqtt.DOMAIN: config
|
||||
})
|
||||
return mock_mqtt
|
||||
assert result
|
||||
|
||||
hass.data['mqtt'] = MagicMock(spec_set=hass.data['mqtt'],
|
||||
wraps=hass.data['mqtt'])
|
||||
|
||||
return hass.data['mqtt']
|
||||
|
||||
|
||||
mock_mqtt_component = threadsafe_coroutine_factory(async_mock_mqtt_component)
|
||||
|
||||
Reference in new issue
Block a user