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

Fix MQTT threading bug (#43667)

Browse source
This commit is contained in:
Erik Montnemery 2020-11-26 22:33:58 +01:00 • committed by GitHub
parent e1de36fda8
commit 8ff10ad3b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/mqtt/__init__.py
View file

@ -944,7 +944,7 @@ class MQTT:
) )
birth_message = Message(**self.conf[CONF_BIRTH_MESSAGE]) birth_message = Message(**self.conf[CONF_BIRTH_MESSAGE])
self.hass.loop.create_task(publish_birth_message(birth_message)) self.hass.add_job(publish_birth_message(birth_message))
def _mqtt_on_message(self, _mqttc, _userdata, msg) -> None: def _mqtt_on_message(self, _mqttc, _userdata, msg) -> None:
"""Message received callback.""" """Message received callback."""

10
tests/components/mqtt/test_init.py
View file

@ -638,8 +638,9 @@ async def test_restore_subscriptions_on_reconnect(hass, mqtt_client_mock, mqtt_m
assert mqtt_client_mock.subscribe.call_count == 1 assert mqtt_client_mock.subscribe.call_count == 1
mqtt_mock._mqtt_on_disconnect(None, None, 0) mqtt_mock._mqtt_on_disconnect(None, None, 0)
mqtt_mock._mqtt_on_connect(None, None, None, 0) with patch("homeassistant.components.mqtt.DISCOVERY_COOLDOWN", 0):
await hass.async_block_till_done() mqtt_mock._mqtt_on_connect(None, None, None, 0)
await hass.async_block_till_done()
assert mqtt_client_mock.subscribe.call_count == 2 assert mqtt_client_mock.subscribe.call_count == 2
@ -671,8 +672,9 @@ async def test_restore_all_active_subscriptions_on_reconnect(
assert mqtt_client_mock.unsubscribe.call_count == 0 assert mqtt_client_mock.unsubscribe.call_count == 0
mqtt_mock._mqtt_on_disconnect(None, None, 0) mqtt_mock._mqtt_on_disconnect(None, None, 0)
mqtt_mock._mqtt_on_connect(None, None, None, 0) with patch("homeassistant.components.mqtt.DISCOVERY_COOLDOWN", 0):
await hass.async_block_till_done() mqtt_mock._mqtt_on_connect(None, None, None, 0)
await hass.async_block_till_done()
expected.append(call("test/state", 1)) expected.append(call("test/state", 1))
assert mqtt_client_mock.subscribe.mock_calls == expected assert mqtt_client_mock.subscribe.mock_calls == expected