mirror of
https://github.com/home-assistant/core.git
synced 2025-07-23 13:17:32 +00:00
Drop unnecessary block_till_done (#23250)
This commit is contained in:
Erik Montnemery
Jason Hu
parent
557211240e
commit
416af5cf57
@ -203,7 +203,6 @@ async def test_no_color_brightness_color_temp_hs_white_xy_if_no_topics(
|
||||
assert state.attributes.get('xy_color') is None
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/status', 'ON')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -255,7 +254,6 @@ async def test_controlling_state_via_topic(hass, mqtt_mock):
|
||||
assert not state.attributes.get(ATTR_ASSUMED_STATE)
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/status', '1')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -268,61 +266,37 @@ async def test_controlling_state_via_topic(hass, mqtt_mock):
|
||||
assert (0.323, 0.329) == state.attributes.get('xy_color')
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/status', '0')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_OFF == state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/status', '1')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/brightness/status', '100')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
assert 100 == \
|
||||
light_state.attributes['brightness']
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/color_temp/status', '300')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
light_state = hass.states.get('light.test')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
assert 300 == light_state.attributes['color_temp']
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/effect/status', 'rainbow')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
light_state = hass.states.get('light.test')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
assert 'rainbow' == light_state.attributes['effect']
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/white_value/status',
|
||||
'100')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
assert 100 == \
|
||||
light_state.attributes['white_value']
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/status', '1')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/rgb/status',
|
||||
'125,125,125')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
assert (255, 255, 255) == \
|
||||
@ -330,8 +304,6 @@ async def test_controlling_state_via_topic(hass, mqtt_mock):
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/hs/status',
|
||||
'200,50')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
assert (200, 50) == \
|
||||
@ -339,8 +311,6 @@ async def test_controlling_state_via_topic(hass, mqtt_mock):
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/xy/status',
|
||||
'0.675,0.322')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
assert (0.672, 0.324) == \
|
||||
@ -371,31 +341,21 @@ async def test_brightness_controlling_scale(hass, mqtt_mock):
|
||||
assert not state.attributes.get(ATTR_ASSUMED_STATE)
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_scale/status', 'on')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
assert 255 == state.attributes.get('brightness')
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_scale/status', 'off')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_OFF == state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_scale/status', 'on')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_scale/brightness/status', '99')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
assert 255 == \
|
||||
light_state.attributes['brightness']
|
||||
|
||||
@ -424,14 +384,11 @@ async def test_brightness_from_rgb_controlling_scale(hass, mqtt_mock):
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_scale_rgb/status', 'on')
|
||||
async_fire_mqtt_message(hass, 'test_scale_rgb/rgb/status', '255,0,0')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert 255 == state.attributes.get('brightness')
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_scale_rgb/rgb/status', '127,0,0')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert 127 == state.attributes.get('brightness')
|
||||
@ -461,27 +418,21 @@ async def test_white_value_controlling_scale(hass, mqtt_mock):
|
||||
assert not state.attributes.get(ATTR_ASSUMED_STATE)
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_scale/status', 'on')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
assert 255 == state.attributes.get('white_value')
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_scale/status', 'off')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_OFF == state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_scale/status', 'on')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_scale/white_value/status', '99')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
await hass.async_block_till_done()
|
||||
assert 255 == \
|
||||
light_state.attributes['white_value']
|
||||
|
||||
@ -536,7 +487,6 @@ async def test_controlling_state_via_topic_with_templates(hass, mqtt_mock):
|
||||
'{"hello": "rainbow"}')
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/white_value/status',
|
||||
'{"hello": "75"}')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -548,16 +498,12 @@ async def test_controlling_state_via_topic_with_templates(hass, mqtt_mock):
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/hs/status',
|
||||
'{"hello": [100,50]}')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert (100, 50) == state.attributes.get('hs_color')
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/xy/status',
|
||||
'{"hello": [0.123,0.123]}')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert (0.14, 0.131) == state.attributes.get('xy_color')
|
||||
@ -726,7 +672,6 @@ async def test_show_brightness_if_only_command_topic(hass, mqtt_mock):
|
||||
assert state.attributes.get('brightness') is None
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/status', 'ON')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -750,7 +695,6 @@ async def test_show_color_temp_only_if_command_topic(hass, mqtt_mock):
|
||||
assert state.attributes.get('color_temp') is None
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/status', 'ON')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -774,7 +718,6 @@ async def test_show_effect_only_if_command_topic(hass, mqtt_mock):
|
||||
assert state.attributes.get('effect') is None
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/status', 'ON')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -798,7 +741,6 @@ async def test_show_hs_if_only_command_topic(hass, mqtt_mock):
|
||||
assert state.attributes.get('hs_color') is None
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/status', 'ON')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -822,7 +764,6 @@ async def test_show_white_value_if_only_command_topic(hass, mqtt_mock):
|
||||
assert state.attributes.get('white_value') is None
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/status', 'ON')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -846,7 +787,6 @@ async def test_show_xy_if_only_command_topic(hass, mqtt_mock):
|
||||
assert state.attributes.get('xy_color') is None
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb/status', 'ON')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -1025,14 +965,11 @@ async def test_default_availability_payload(hass, mqtt_mock):
|
||||
assert STATE_UNAVAILABLE == state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'availability-topic', 'online')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_UNAVAILABLE != state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'availability-topic', 'offline')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_UNAVAILABLE == state.state
|
||||
@ -1057,14 +994,11 @@ async def test_custom_availability_payload(hass, mqtt_mock):
|
||||
assert STATE_UNAVAILABLE == state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'availability-topic', 'good')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_UNAVAILABLE != state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'availability-topic', 'nogood')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_UNAVAILABLE == state.state
|
||||
@ -1082,7 +1016,6 @@ async def test_setting_attribute_via_mqtt_json_message(hass, mqtt_mock):
|
||||
})
|
||||
|
||||
async_fire_mqtt_message(hass, 'attr-topic', '{ "val": "100" }')
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.test')
|
||||
|
||||
assert '100' == state.attributes.get('val')
|
||||
@ -1100,7 +1033,6 @@ async def test_update_with_json_attrs_not_dict(hass, mqtt_mock, caplog):
|
||||
})
|
||||
|
||||
async_fire_mqtt_message(hass, 'attr-topic', '[ "list", "of", "things"]')
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.test')
|
||||
|
||||
assert state.attributes.get('val') is None
|
||||
@ -1119,7 +1051,6 @@ async def test_update_with_json_attrs_bad_JSON(hass, mqtt_mock, caplog):
|
||||
})
|
||||
|
||||
async_fire_mqtt_message(hass, 'attr-topic', 'This is not JSON')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert state.attributes.get('val') is None
|
||||
@ -1144,8 +1075,6 @@ async def test_discovery_update_attr(hass, mqtt_mock, caplog):
|
||||
data1)
|
||||
await hass.async_block_till_done()
|
||||
async_fire_mqtt_message(hass, 'attr-topic1', '{ "val": "100" }')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.beer')
|
||||
assert '100' == state.attributes.get('val')
|
||||
|
||||
@ -1153,19 +1082,14 @@ async def test_discovery_update_attr(hass, mqtt_mock, caplog):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data2)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
# Verify we are no longer subscribing to the old topic
|
||||
async_fire_mqtt_message(hass, 'attr-topic1', '{ "val": "50" }')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.beer')
|
||||
assert '100' == state.attributes.get('val')
|
||||
|
||||
# Verify we are subscribing to the new topic
|
||||
async_fire_mqtt_message(hass, 'attr-topic2', '{ "val": "75" }')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.beer')
|
||||
assert '75' == state.attributes.get('val')
|
||||
|
||||
@ -1189,7 +1113,6 @@ async def test_unique_id(hass):
|
||||
}]
|
||||
})
|
||||
async_fire_mqtt_message(hass, 'test-topic', 'payload')
|
||||
await hass.async_block_till_done()
|
||||
assert len(hass.states.async_entity_ids(light.DOMAIN)) == 1
|
||||
|
||||
|
||||
@ -1215,7 +1138,6 @@ async def test_discovery_removal_light(hass, mqtt_mock, caplog):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
'')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.beer')
|
||||
assert state is None
|
||||
@ -1265,7 +1187,6 @@ async def test_discovery_update_light(hass, mqtt_mock, caplog):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data2)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.beer')
|
||||
assert state is not None
|
||||
@ -1298,7 +1219,6 @@ async def test_discovery_broken(hass, mqtt_mock, caplog):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data2)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.milk')
|
||||
assert state is not None
|
||||
@ -1334,7 +1254,6 @@ async def test_entity_device_info_with_identifier(hass, mqtt_mock):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
device = registry.async_get_device({('mqtt', 'helloworld')}, set())
|
||||
assert device is not None
|
||||
@ -1375,7 +1294,6 @@ async def test_entity_device_info_update(hass, mqtt_mock):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
device = registry.async_get_device({('mqtt', 'helloworld')}, set())
|
||||
assert device is not None
|
||||
@ -1386,7 +1304,6 @@ async def test_entity_device_info_update(hass, mqtt_mock):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
device = registry.async_get_device({('mqtt', 'helloworld')}, set())
|
||||
assert device is not None
|
||||
@ -1417,7 +1334,6 @@ async def test_entity_id_update(hass, mqtt_mock):
|
||||
|
||||
registry.async_update_entity('light.beer', new_entity_id='light.milk')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.beer')
|
||||
assert state is None
|
||||
|
||||
@ -154,7 +154,6 @@ async def test_no_color_brightness_color_temp_white_val_if_no_topics(
|
||||
assert state.attributes.get('hs_color') is None
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb', '{"state":"ON"}')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -207,7 +206,6 @@ async def test_controlling_state_via_topic(hass, mqtt_mock):
|
||||
'"color_temp":155,'
|
||||
'"effect":"colorloop",'
|
||||
'"white_value":150}')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -221,16 +219,12 @@ async def test_controlling_state_via_topic(hass, mqtt_mock):
|
||||
|
||||
# Turn the light off
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb', '{"state":"OFF"}')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_OFF == state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb',
|
||||
'{"state":"ON", "brightness":100}')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
|
||||
@ -240,7 +234,6 @@ async def test_controlling_state_via_topic(hass, mqtt_mock):
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb',
|
||||
'{"state":"ON", '
|
||||
'"color":{"r":125,"g":125,"b":125}}')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
assert (255, 255, 255) == \
|
||||
@ -248,8 +241,6 @@ async def test_controlling_state_via_topic(hass, mqtt_mock):
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb',
|
||||
'{"state":"ON", "color":{"x":0.135,"y":0.135}}')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
assert (0.141, 0.14) == \
|
||||
@ -257,8 +248,6 @@ async def test_controlling_state_via_topic(hass, mqtt_mock):
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb',
|
||||
'{"state":"ON", "color":{"h":180,"s":50}}')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
assert (180.0, 50.0) == \
|
||||
@ -266,24 +255,18 @@ async def test_controlling_state_via_topic(hass, mqtt_mock):
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb',
|
||||
'{"state":"ON", "color_temp":155}')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
assert 155 == light_state.attributes.get('color_temp')
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb',
|
||||
'{"state":"ON", "effect":"colorloop"}')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
assert 'colorloop' == light_state.attributes.get('effect')
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb',
|
||||
'{"state":"ON", "white_value":155}')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
assert 155 == light_state.attributes.get('white_value')
|
||||
@ -665,7 +648,6 @@ async def test_brightness_scale(hass, mqtt_mock):
|
||||
|
||||
# Turn on the light
|
||||
async_fire_mqtt_message(hass, 'test_light_bright_scale', '{"state":"ON"}')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -674,7 +656,6 @@ async def test_brightness_scale(hass, mqtt_mock):
|
||||
# Turn on the light with brightness
|
||||
async_fire_mqtt_message(hass, 'test_light_bright_scale',
|
||||
'{"state":"ON", "brightness": 99}')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -711,7 +692,6 @@ async def test_invalid_color_brightness_and_white_values(hass, mqtt_mock):
|
||||
'"color":{"r":255,"g":255,"b":255},'
|
||||
'"brightness": 255,'
|
||||
'"white_value": 255}')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -723,7 +703,6 @@ async def test_invalid_color_brightness_and_white_values(hass, mqtt_mock):
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb',
|
||||
'{"state":"ON",'
|
||||
'"color":{"r":"bad","g":"val","b":"test"}}')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
# Color should not have changed
|
||||
state = hass.states.get('light.test')
|
||||
@ -734,7 +713,6 @@ async def test_invalid_color_brightness_and_white_values(hass, mqtt_mock):
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb',
|
||||
'{"state":"ON",'
|
||||
'"brightness": "badValue"}')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
# Brightness should not have changed
|
||||
state = hass.states.get('light.test')
|
||||
@ -745,7 +723,6 @@ async def test_invalid_color_brightness_and_white_values(hass, mqtt_mock):
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb',
|
||||
'{"state":"ON",'
|
||||
'"white_value": "badValue"}')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
# White value should not have changed
|
||||
state = hass.states.get('light.test')
|
||||
@ -770,14 +747,11 @@ async def test_default_availability_payload(hass, mqtt_mock):
|
||||
assert STATE_UNAVAILABLE == state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'availability-topic', 'online')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_UNAVAILABLE != state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'availability-topic', 'offline')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_UNAVAILABLE == state.state
|
||||
@ -802,14 +776,11 @@ async def test_custom_availability_payload(hass, mqtt_mock):
|
||||
assert STATE_UNAVAILABLE == state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'availability-topic', 'good')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_UNAVAILABLE != state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'availability-topic', 'nogood')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_UNAVAILABLE == state.state
|
||||
@ -828,7 +799,6 @@ async def test_setting_attribute_via_mqtt_json_message(hass, mqtt_mock):
|
||||
})
|
||||
|
||||
async_fire_mqtt_message(hass, 'attr-topic', '{ "val": "100" }')
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.test')
|
||||
|
||||
assert '100' == state.attributes.get('val')
|
||||
@ -847,7 +817,6 @@ async def test_update_with_json_attrs_not_dict(hass, mqtt_mock, caplog):
|
||||
})
|
||||
|
||||
async_fire_mqtt_message(hass, 'attr-topic', '[ "list", "of", "things"]')
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.test')
|
||||
|
||||
assert state.attributes.get('val') is None
|
||||
@ -867,7 +836,6 @@ async def test_update_with_json_attrs_bad_JSON(hass, mqtt_mock, caplog):
|
||||
})
|
||||
|
||||
async_fire_mqtt_message(hass, 'attr-topic', 'This is not JSON')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert state.attributes.get('val') is None
|
||||
@ -894,8 +862,6 @@ async def test_discovery_update_attr(hass, mqtt_mock, caplog):
|
||||
data1)
|
||||
await hass.async_block_till_done()
|
||||
async_fire_mqtt_message(hass, 'attr-topic1', '{ "val": "100" }')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.beer')
|
||||
assert '100' == state.attributes.get('val')
|
||||
|
||||
@ -903,19 +869,14 @@ async def test_discovery_update_attr(hass, mqtt_mock, caplog):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data2)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
# Verify we are no longer subscribing to the old topic
|
||||
async_fire_mqtt_message(hass, 'attr-topic1', '{ "val": "50" }')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.beer')
|
||||
assert '100' == state.attributes.get('val')
|
||||
|
||||
# Verify we are subscribing to the new topic
|
||||
async_fire_mqtt_message(hass, 'attr-topic2', '{ "val": "75" }')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.beer')
|
||||
assert '75' == state.attributes.get('val')
|
||||
|
||||
@ -941,7 +902,6 @@ async def test_unique_id(hass):
|
||||
}]
|
||||
})
|
||||
async_fire_mqtt_message(hass, 'test-topic', 'payload')
|
||||
await hass.async_block_till_done()
|
||||
assert len(hass.states.async_entity_ids(light.DOMAIN)) == 1
|
||||
|
||||
|
||||
@ -963,7 +923,6 @@ async def test_discovery_removal(hass, mqtt_mock, caplog):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
'')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.beer')
|
||||
assert state is None
|
||||
|
||||
@ -1014,7 +973,6 @@ async def test_discovery_update_light(hass, mqtt_mock, caplog):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data2)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.beer')
|
||||
assert state is not None
|
||||
@ -1048,7 +1006,6 @@ async def test_discovery_broken(hass, mqtt_mock, caplog):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data2)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.milk')
|
||||
assert state is not None
|
||||
@ -1085,7 +1042,6 @@ async def test_entity_device_info_with_identifier(hass, mqtt_mock):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
device = registry.async_get_device({('mqtt', 'helloworld')}, set())
|
||||
assert device is not None
|
||||
@ -1127,7 +1083,6 @@ async def test_entity_device_info_update(hass, mqtt_mock):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
device = registry.async_get_device({('mqtt', 'helloworld')}, set())
|
||||
assert device is not None
|
||||
@ -1138,7 +1093,6 @@ async def test_entity_device_info_update(hass, mqtt_mock):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
device = registry.async_get_device({('mqtt', 'helloworld')}, set())
|
||||
assert device is not None
|
||||
@ -1170,7 +1124,6 @@ async def test_entity_id_update(hass, mqtt_mock):
|
||||
|
||||
registry.async_update_entity('light.beer', new_entity_id='light.milk')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.beer')
|
||||
assert state is None
|
||||
|
||||
@ -120,7 +120,6 @@ async def test_state_change_via_topic(hass, mqtt_mock):
|
||||
assert not state.attributes.get(ATTR_ASSUMED_STATE)
|
||||
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb', 'on')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -177,7 +176,6 @@ async def test_state_brightness_color_effect_temp_white_change_via_topic(
|
||||
# turn on the light, full white
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb',
|
||||
'on,255,145,123,255-128-64,')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -189,32 +187,24 @@ async def test_state_brightness_color_effect_temp_white_change_via_topic(
|
||||
|
||||
# turn the light off
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb', 'off')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_OFF == state.state
|
||||
|
||||
# lower the brightness
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb', 'on,100')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
assert 100 == light_state.attributes['brightness']
|
||||
|
||||
# change the color temp
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb', 'on,,195')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
assert 195 == light_state.attributes['color_temp']
|
||||
|
||||
# change the color
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb', 'on,,,,41-42-43')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
assert (243, 249, 255) == \
|
||||
@ -222,8 +212,6 @@ async def test_state_brightness_color_effect_temp_white_change_via_topic(
|
||||
|
||||
# change the white value
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb', 'on,,,134')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
assert 134 == light_state.attributes['white_value']
|
||||
@ -231,8 +219,6 @@ async def test_state_brightness_color_effect_temp_white_change_via_topic(
|
||||
# change the effect
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb',
|
||||
'on,,,,41-42-43,rainbow')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
light_state = hass.states.get('light.test')
|
||||
assert 'rainbow' == light_state.attributes.get('effect')
|
||||
@ -361,7 +347,6 @@ async def test_invalid_values(hass, mqtt_mock):
|
||||
# turn on the light, full white
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb',
|
||||
'on,255,215,222,255-255-255,rainbow')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_ON == state.state
|
||||
@ -373,7 +358,6 @@ async def test_invalid_values(hass, mqtt_mock):
|
||||
|
||||
# bad state value
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb', 'offf')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
# state should not have changed
|
||||
state = hass.states.get('light.test')
|
||||
@ -381,7 +365,6 @@ async def test_invalid_values(hass, mqtt_mock):
|
||||
|
||||
# bad brightness values
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb', 'on,off,255-255-255')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
# brightness should not have changed
|
||||
state = hass.states.get('light.test')
|
||||
@ -389,7 +372,6 @@ async def test_invalid_values(hass, mqtt_mock):
|
||||
|
||||
# bad color temp values
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb', 'on,,off,255-255-255')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
# color temp should not have changed
|
||||
state = hass.states.get('light.test')
|
||||
@ -397,7 +379,6 @@ async def test_invalid_values(hass, mqtt_mock):
|
||||
|
||||
# bad color values
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb', 'on,255,a-b-c')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
# color should not have changed
|
||||
state = hass.states.get('light.test')
|
||||
@ -405,7 +386,6 @@ async def test_invalid_values(hass, mqtt_mock):
|
||||
|
||||
# bad white value values
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb', 'on,,,off,255-255-255')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
# white value should not have changed
|
||||
state = hass.states.get('light.test')
|
||||
@ -413,7 +393,6 @@ async def test_invalid_values(hass, mqtt_mock):
|
||||
|
||||
# bad effect value
|
||||
async_fire_mqtt_message(hass, 'test_light_rgb', 'on,255,a-b-c,white')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
# effect should not have changed
|
||||
state = hass.states.get('light.test')
|
||||
@ -438,14 +417,11 @@ async def test_default_availability_payload(hass, mqtt_mock):
|
||||
assert STATE_UNAVAILABLE == state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'availability-topic', 'online')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_UNAVAILABLE != state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'availability-topic', 'offline')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_UNAVAILABLE == state.state
|
||||
@ -471,14 +447,11 @@ async def test_custom_availability_payload(hass, mqtt_mock):
|
||||
assert STATE_UNAVAILABLE == state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'availability-topic', 'good')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_UNAVAILABLE != state.state
|
||||
|
||||
async_fire_mqtt_message(hass, 'availability-topic', 'nogood')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert STATE_UNAVAILABLE == state.state
|
||||
@ -499,7 +472,6 @@ async def test_setting_attribute_via_mqtt_json_message(hass, mqtt_mock):
|
||||
})
|
||||
|
||||
async_fire_mqtt_message(hass, 'attr-topic', '{ "val": "100" }')
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.test')
|
||||
|
||||
assert '100' == state.attributes.get('val')
|
||||
@ -520,7 +492,6 @@ async def test_update_with_json_attrs_not_dict(hass, mqtt_mock, caplog):
|
||||
})
|
||||
|
||||
async_fire_mqtt_message(hass, 'attr-topic', '[ "list", "of", "things"]')
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.test')
|
||||
|
||||
assert state.attributes.get('val') is None
|
||||
@ -542,7 +513,6 @@ async def test_update_with_json_attrs_bad_JSON(hass, mqtt_mock, caplog):
|
||||
})
|
||||
|
||||
async_fire_mqtt_message(hass, 'attr-topic', 'This is not JSON')
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.test')
|
||||
assert state.attributes.get('val') is None
|
||||
@ -573,8 +543,6 @@ async def test_discovery_update_attr(hass, mqtt_mock, caplog):
|
||||
data1)
|
||||
await hass.async_block_till_done()
|
||||
async_fire_mqtt_message(hass, 'attr-topic1', '{ "val": "100" }')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.beer')
|
||||
assert '100' == state.attributes.get('val')
|
||||
|
||||
@ -582,19 +550,14 @@ async def test_discovery_update_attr(hass, mqtt_mock, caplog):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data2)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
# Verify we are no longer subscribing to the old topic
|
||||
async_fire_mqtt_message(hass, 'attr-topic1', '{ "val": "50" }')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.beer')
|
||||
assert '100' == state.attributes.get('val')
|
||||
|
||||
# Verify we are subscribing to the new topic
|
||||
async_fire_mqtt_message(hass, 'attr-topic2', '{ "val": "75" }')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.beer')
|
||||
assert '75' == state.attributes.get('val')
|
||||
|
||||
@ -622,7 +585,6 @@ async def test_unique_id(hass):
|
||||
}]
|
||||
})
|
||||
async_fire_mqtt_message(hass, 'test-topic', 'payload')
|
||||
await hass.async_block_till_done()
|
||||
assert len(hass.states.async_entity_ids(light.DOMAIN)) == 1
|
||||
|
||||
|
||||
@ -646,7 +608,6 @@ async def test_discovery_removal(hass, mqtt_mock, caplog):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
'')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get('light.beer')
|
||||
assert state is None
|
||||
|
||||
@ -703,7 +664,6 @@ async def test_discovery_update_light(hass, mqtt_mock, caplog):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data2)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.beer')
|
||||
assert state is not None
|
||||
@ -739,7 +699,6 @@ async def test_discovery_broken(hass, mqtt_mock, caplog):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data2)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.milk')
|
||||
assert state is not None
|
||||
@ -778,7 +737,6 @@ async def test_entity_device_info_with_identifier(hass, mqtt_mock):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
device = registry.async_get_device({('mqtt', 'helloworld')}, set())
|
||||
assert device is not None
|
||||
@ -822,7 +780,6 @@ async def test_entity_device_info_update(hass, mqtt_mock):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
device = registry.async_get_device({('mqtt', 'helloworld')}, set())
|
||||
assert device is not None
|
||||
@ -833,7 +790,6 @@ async def test_entity_device_info_update(hass, mqtt_mock):
|
||||
async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
|
||||
data)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
device = registry.async_get_device({('mqtt', 'helloworld')}, set())
|
||||
assert device is not None
|
||||
@ -867,7 +823,6 @@ async def test_entity_id_update(hass, mqtt_mock):
|
||||
|
||||
registry.async_update_entity('light.beer', new_entity_id='light.milk')
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get('light.beer')
|
||||
assert state is None
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user