MQTT convert to async (#6064)
* Migrate mqtt to async * address paulus comment / convert it complet async * adress paulus comment / remove future * Automation triggers should be async * Fix MQTT async calls * Show that event helpers are callbacks * Fix tests * Lint
This commit is contained in:
1 parent
fa2c1dafdf
commit
e1cbd6b4c0
25 files changed
+356
-231
No files matched your search
@@ -74,6 +74,7 @@ light:
|
||||
|
||||
"""
|
||||
import unittest
|
||||
from unittest import mock
|
||||
|
||||
from homeassistant.bootstrap import setup_component
|
||||
from homeassistant.const import STATE_ON, STATE_OFF, ATTR_ASSUMED_STATE
|
||||
@@ -328,7 +329,7 @@ class TestLightMQTT(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(('test_light_rgb/set', 'on', 2, False),
|
||||
self.mock_publish.mock_calls[-1][1])
|
||||
self.mock_publish.mock_calls[-2][1])
|
||||
state = self.hass.states.get('light.test')
|
||||
self.assertEqual(STATE_ON, state.state)
|
||||
|
||||
@@ -336,27 +337,20 @@ class TestLightMQTT(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(('test_light_rgb/set', 'off', 2, False),
|
||||
self.mock_publish.mock_calls[-1][1])
|
||||
self.mock_publish.mock_calls[-2][1])
|
||||
state = self.hass.states.get('light.test')
|
||||
self.assertEqual(STATE_OFF, state.state)
|
||||
|
||||
self.mock_publish.reset_mock()
|
||||
light.turn_on(self.hass, 'light.test', rgb_color=[75, 75, 75],
|
||||
brightness=50)
|
||||
self.hass.block_till_done()
|
||||
|
||||
# Calls are threaded so we need to reorder them
|
||||
bright_call, rgb_call, state_call = \
|
||||
sorted((call[1] for call in self.mock_publish.mock_calls[-3:]),
|
||||
key=lambda call: call[0])
|
||||
|
||||
self.assertEqual(('test_light_rgb/set', 'on', 2, False),
|
||||
state_call)
|
||||
|
||||
self.assertEqual(('test_light_rgb/rgb/set', '75,75,75', 2, False),
|
||||
rgb_call)
|
||||
|
||||
self.assertEqual(('test_light_rgb/brightness/set', 50, 2, False),
|
||||
bright_call)
|
||||
self.mock_publish().async_publish.assert_has_calls([
|
||||
mock.call('test_light_rgb/set', 'on', 2, False),
|
||||
mock.call('test_light_rgb/rgb/set', '75,75,75', 2, False),
|
||||
mock.call('test_light_rgb/brightness/set', 50, 2, False),
|
||||
], any_order=True)
|
||||
|
||||
state = self.hass.states.get('light.test')
|
||||
self.assertEqual(STATE_ON, state.state)
|
||||
|
||||
@@ -172,7 +172,7 @@ class TestLightMQTTJSON(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(('test_light_rgb/set', '{"state": "ON"}', 2, False),
|
||||
self.mock_publish.mock_calls[-1][1])
|
||||
self.mock_publish.mock_calls[-2][1])
|
||||
state = self.hass.states.get('light.test')
|
||||
self.assertEqual(STATE_ON, state.state)
|
||||
|
||||
@@ -180,7 +180,7 @@ class TestLightMQTTJSON(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(('test_light_rgb/set', '{"state": "OFF"}', 2, False),
|
||||
self.mock_publish.mock_calls[-1][1])
|
||||
self.mock_publish.mock_calls[-2][1])
|
||||
state = self.hass.states.get('light.test')
|
||||
self.assertEqual(STATE_OFF, state.state)
|
||||
|
||||
@@ -189,11 +189,11 @@ class TestLightMQTTJSON(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual('test_light_rgb/set',
|
||||
self.mock_publish.mock_calls[-1][1][0])
|
||||
self.assertEqual(2, self.mock_publish.mock_calls[-1][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-1][1][3])
|
||||
self.mock_publish.mock_calls[-2][1][0])
|
||||
self.assertEqual(2, self.mock_publish.mock_calls[-2][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-2][1][3])
|
||||
# Get the sent message
|
||||
message_json = json.loads(self.mock_publish.mock_calls[-1][1][1])
|
||||
message_json = json.loads(self.mock_publish.mock_calls[-2][1][1])
|
||||
self.assertEqual(50, message_json["brightness"])
|
||||
self.assertEqual(75, message_json["color"]["r"])
|
||||
self.assertEqual(75, message_json["color"]["g"])
|
||||
@@ -228,11 +228,11 @@ class TestLightMQTTJSON(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual('test_light_rgb/set',
|
||||
self.mock_publish.mock_calls[-1][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-1][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-1][1][3])
|
||||
self.mock_publish.mock_calls[-2][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-2][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-2][1][3])
|
||||
# Get the sent message
|
||||
message_json = json.loads(self.mock_publish.mock_calls[-1][1][1])
|
||||
message_json = json.loads(self.mock_publish.mock_calls[-2][1][1])
|
||||
self.assertEqual(5, message_json["flash"])
|
||||
self.assertEqual("ON", message_json["state"])
|
||||
|
||||
@@ -240,11 +240,11 @@ class TestLightMQTTJSON(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual('test_light_rgb/set',
|
||||
self.mock_publish.mock_calls[-1][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-1][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-1][1][3])
|
||||
self.mock_publish.mock_calls[-2][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-2][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-2][1][3])
|
||||
# Get the sent message
|
||||
message_json = json.loads(self.mock_publish.mock_calls[-1][1][1])
|
||||
message_json = json.loads(self.mock_publish.mock_calls[-2][1][1])
|
||||
self.assertEqual(15, message_json["flash"])
|
||||
self.assertEqual("ON", message_json["state"])
|
||||
|
||||
@@ -268,11 +268,11 @@ class TestLightMQTTJSON(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual('test_light_rgb/set',
|
||||
self.mock_publish.mock_calls[-1][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-1][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-1][1][3])
|
||||
self.mock_publish.mock_calls[-2][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-2][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-2][1][3])
|
||||
# Get the sent message
|
||||
message_json = json.loads(self.mock_publish.mock_calls[-1][1][1])
|
||||
message_json = json.loads(self.mock_publish.mock_calls[-2][1][1])
|
||||
self.assertEqual(10, message_json["transition"])
|
||||
self.assertEqual("ON", message_json["state"])
|
||||
|
||||
@@ -281,11 +281,11 @@ class TestLightMQTTJSON(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual('test_light_rgb/set',
|
||||
self.mock_publish.mock_calls[-1][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-1][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-1][1][3])
|
||||
self.mock_publish.mock_calls[-2][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-2][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-2][1][3])
|
||||
# Get the sent message
|
||||
message_json = json.loads(self.mock_publish.mock_calls[-1][1][1])
|
||||
message_json = json.loads(self.mock_publish.mock_calls[-2][1][1])
|
||||
self.assertEqual(10, message_json["transition"])
|
||||
self.assertEqual("OFF", message_json["state"])
|
||||
|
||||
|
||||
@@ -196,7 +196,7 @@ class TestLightMQTTTemplate(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(('test_light_rgb/set', 'on,,--', 2, False),
|
||||
self.mock_publish.mock_calls[-1][1])
|
||||
self.mock_publish.mock_calls[-2][1])
|
||||
state = self.hass.states.get('light.test')
|
||||
self.assertEqual(STATE_ON, state.state)
|
||||
|
||||
@@ -205,7 +205,7 @@ class TestLightMQTTTemplate(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(('test_light_rgb/set', 'off', 2, False),
|
||||
self.mock_publish.mock_calls[-1][1])
|
||||
self.mock_publish.mock_calls[-2][1])
|
||||
state = self.hass.states.get('light.test')
|
||||
self.assertEqual(STATE_OFF, state.state)
|
||||
|
||||
@@ -215,12 +215,12 @@ class TestLightMQTTTemplate(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual('test_light_rgb/set',
|
||||
self.mock_publish.mock_calls[-1][1][0])
|
||||
self.assertEqual(2, self.mock_publish.mock_calls[-1][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-1][1][3])
|
||||
self.mock_publish.mock_calls[-2][1][0])
|
||||
self.assertEqual(2, self.mock_publish.mock_calls[-2][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-2][1][3])
|
||||
|
||||
# check the payload
|
||||
payload = self.mock_publish.mock_calls[-1][1][1]
|
||||
payload = self.mock_publish.mock_calls[-2][1][1]
|
||||
self.assertEqual('on,50,75-75-75', payload)
|
||||
|
||||
# check the state
|
||||
@@ -253,12 +253,12 @@ class TestLightMQTTTemplate(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual('test_light_rgb/set',
|
||||
self.mock_publish.mock_calls[-1][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-1][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-1][1][3])
|
||||
self.mock_publish.mock_calls[-2][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-2][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-2][1][3])
|
||||
|
||||
# check the payload
|
||||
payload = self.mock_publish.mock_calls[-1][1][1]
|
||||
payload = self.mock_publish.mock_calls[-2][1][1]
|
||||
self.assertEqual('on,short', payload)
|
||||
|
||||
# long flash
|
||||
@@ -266,12 +266,12 @@ class TestLightMQTTTemplate(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual('test_light_rgb/set',
|
||||
self.mock_publish.mock_calls[-1][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-1][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-1][1][3])
|
||||
self.mock_publish.mock_calls[-2][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-2][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-2][1][3])
|
||||
|
||||
# check the payload
|
||||
payload = self.mock_publish.mock_calls[-1][1][1]
|
||||
payload = self.mock_publish.mock_calls[-2][1][1]
|
||||
self.assertEqual('on,long', payload)
|
||||
|
||||
def test_transition(self):
|
||||
@@ -296,12 +296,12 @@ class TestLightMQTTTemplate(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual('test_light_rgb/set',
|
||||
self.mock_publish.mock_calls[-1][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-1][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-1][1][3])
|
||||
self.mock_publish.mock_calls[-2][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-2][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-2][1][3])
|
||||
|
||||
# check the payload
|
||||
payload = self.mock_publish.mock_calls[-1][1][1]
|
||||
payload = self.mock_publish.mock_calls[-2][1][1]
|
||||
self.assertEqual('on,10', payload)
|
||||
|
||||
# transition off
|
||||
@@ -309,12 +309,12 @@ class TestLightMQTTTemplate(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual('test_light_rgb/set',
|
||||
self.mock_publish.mock_calls[-1][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-1][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-1][1][3])
|
||||
self.mock_publish.mock_calls[-2][1][0])
|
||||
self.assertEqual(0, self.mock_publish.mock_calls[-2][1][2])
|
||||
self.assertEqual(False, self.mock_publish.mock_calls[-2][1][3])
|
||||
|
||||
# check the payload
|
||||
payload = self.mock_publish.mock_calls[-1][1][1]
|
||||
payload = self.mock_publish.mock_calls[-2][1][1]
|
||||
self.assertEqual('off,4', payload)
|
||||
|
||||
def test_invalid_values(self): \
|
||||
|
||||
Reference in new issue
Block a user