Fix discovery update of MQTT light (#39325)
This commit is contained in:
1 parent
e55a014e94
commit
4c6960ed36
6 files changed
+105
-69
No files matched your search
@@ -503,7 +503,20 @@ async def help_test_discovery_removal(hass, mqtt_mock, caplog, domain, data):
|
||||
assert state is None
|
||||
|
||||
|
||||
async def help_test_discovery_update(hass, mqtt_mock, caplog, domain, data1, data2):
|
||||
async def help_test_discovery_update(
|
||||
hass,
|
||||
mqtt_mock,
|
||||
caplog,
|
||||
domain,
|
||||
discovery_data1,
|
||||
discovery_data2,
|
||||
state_data1=None,
|
||||
state_data2=None,
|
||||
state1=None,
|
||||
state2=None,
|
||||
attributes1=None,
|
||||
attributes2=None,
|
||||
):
|
||||
"""Test update of discovered component.
|
||||
|
||||
This is a test helper for the MqttDiscoveryUpdate mixin.
|
||||
@@ -511,19 +524,35 @@ async def help_test_discovery_update(hass, mqtt_mock, caplog, domain, data1, dat
|
||||
entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
|
||||
await async_start(hass, "homeassistant", entry)
|
||||
|
||||
async_fire_mqtt_message(hass, f"homeassistant/{domain}/bla/config", data1)
|
||||
async_fire_mqtt_message(hass, f"homeassistant/{domain}/bla/config", discovery_data1)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
if state_data1:
|
||||
for (topic, data) in state_data1:
|
||||
async_fire_mqtt_message(hass, topic, data)
|
||||
state = hass.states.get(f"{domain}.beer")
|
||||
assert state is not None
|
||||
assert state.name == "Beer"
|
||||
if state1:
|
||||
assert state.state == state1
|
||||
if attributes1:
|
||||
for (attr, value) in attributes1:
|
||||
assert state.attributes.get(attr) == value
|
||||
|
||||
async_fire_mqtt_message(hass, f"homeassistant/{domain}/bla/config", data2)
|
||||
async_fire_mqtt_message(hass, f"homeassistant/{domain}/bla/config", discovery_data2)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
if state_data2:
|
||||
for (topic, data) in state_data2:
|
||||
async_fire_mqtt_message(hass, topic, data)
|
||||
state = hass.states.get(f"{domain}.beer")
|
||||
assert state is not None
|
||||
assert state.name == "Milk"
|
||||
if state2:
|
||||
assert state.state == state2
|
||||
if attributes2:
|
||||
for (attr, value) in attributes2:
|
||||
assert state.attributes.get(attr) == value
|
||||
|
||||
state = hass.states.get(f"{domain}.milk")
|
||||
assert state is None
|
||||
|
||||
@@ -716,9 +716,8 @@ async def test_sending_mqtt_commands_and_optimistic(hass, mqtt_mock):
|
||||
hass, "light.test", brightness=50, xy_color=[0.123, 0.123]
|
||||
)
|
||||
await common.async_turn_on(hass, "light.test", brightness=50, hs_color=[359, 78])
|
||||
await common.async_turn_on(
|
||||
hass, "light.test", rgb_color=[255, 128, 0], white_value=80
|
||||
)
|
||||
await common.async_turn_on(hass, "light.test", rgb_color=[255, 128, 0])
|
||||
await common.async_turn_on(hass, "light.test", white_value=80, color_temp=125)
|
||||
|
||||
mqtt_mock.async_publish.assert_has_calls(
|
||||
[
|
||||
@@ -728,6 +727,7 @@ async def test_sending_mqtt_commands_and_optimistic(hass, mqtt_mock):
|
||||
call("test_light_rgb/hs/set", "359.0,78.0", 2, False),
|
||||
call("test_light_rgb/white_value/set", 80, 2, False),
|
||||
call("test_light_rgb/xy/set", "0.14,0.131", 2, False),
|
||||
call("test_light_rgb/color_temp/set", 125, 2, False),
|
||||
],
|
||||
any_order=True,
|
||||
)
|
||||
@@ -1439,15 +1439,26 @@ async def test_discovery_update_light(hass, mqtt_mock, caplog):
|
||||
data1 = (
|
||||
'{ "name": "Beer",'
|
||||
' "state_topic": "test_topic",'
|
||||
' "command_topic": "test_topic" }'
|
||||
' "command_topic": "test_topic",'
|
||||
' "state_value_template": "{{value_json.power1}}" }'
|
||||
)
|
||||
data2 = (
|
||||
'{ "name": "Milk",'
|
||||
' "state_topic": "test_topic",'
|
||||
' "command_topic": "test_topic" }'
|
||||
' "command_topic": "test_topic",'
|
||||
' "state_value_template": "{{value_json.power2}}" }'
|
||||
)
|
||||
await help_test_discovery_update(
|
||||
hass, mqtt_mock, caplog, light.DOMAIN, data1, data2
|
||||
hass,
|
||||
mqtt_mock,
|
||||
caplog,
|
||||
light.DOMAIN,
|
||||
data1,
|
||||
data2,
|
||||
state_data1=[("test_topic", '{"power1":"ON"}')],
|
||||
state1="on",
|
||||
state_data2=[("test_topic", '{"power2":"OFF"}')],
|
||||
state2="off",
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user