Skip to content

Fix MQTT payload decode returning prematurely #12420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 2 commits into from
Feb 15, 2018
Merged

Fix MQTT payload decode returning prematurely #12420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
070de2a
Fix MQTT returning prematurely
OttoWinter Feb 14, 2018
6ed7a1c
Add test
OttoWinter Feb 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion homeassistant/components/mqtt/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ def _mqtt_handle_message(self, msg):
"with encoding %s",
msg.payload, msg.topic,
subscription.encoding)
return
continue

self.hass.async_run_job(subscription.callback,
msg.topic, payload, msg.qos)
Expand Down
11 changes: 11 additions & 0 deletions tests/components/mqtt/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,17 @@ def test_receiving_non_utf8_message_gets_logged(self):
"b'\\x9a' on test-topic with encoding utf-8",
test_handle.output[0])

def test_all_subscriptions_run_when_decode_fails(self):
"""Test all other subscriptions still run when decode fails for one."""
mqtt.subscribe(self.hass, 'test-topic', self.record_calls,
encoding='ascii')
mqtt.subscribe(self.hass, 'test-topic', self.record_calls)

fire_mqtt_message(self.hass, 'test-topic', '°C')

self.hass.block_till_done()
self.assertEqual(1, len(self.calls))

def test_subscribe_topic(self):
"""Test the subscription of a topic."""
unsub = mqtt.subscribe(self.hass, 'test-topic', self.record_calls)
Expand Down