jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-09 06:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop unnecessary block_till_done (#23256)

Browse Source
This commit is contained in:
Erik Montnemery 2019-04-20 01:08:11 +02:00 committed by Jason Hu
parent eebb452fb5
commit 1e0bc97f56
1 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tests/components/mqtt/test_switch.py
View File

@ -42,14 +42,11 @@ async def test_controlling_state_via_topic(hass, mock_publish):
assert not state.attributes.get(ATTR_ASSUMED_STATE) assert not state.attributes.get(ATTR_ASSUMED_STATE)
async_fire_mqtt_message(hass, 'state-topic', '1') async_fire_mqtt_message(hass, 'state-topic', '1')
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert STATE_ON == state.state assert STATE_ON == state.state
async_fire_mqtt_message(hass, 'state-topic', '0') async_fire_mqtt_message(hass, 'state-topic', '0')
await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert STATE_OFF == state.state assert STATE_OFF == state.state
@ -115,15 +112,11 @@ async def test_controlling_state_via_topic_and_json_message(
assert STATE_OFF == state.state assert STATE_OFF == state.state
async_fire_mqtt_message(hass, 'state-topic', '{"val":"beer on"}') async_fire_mqtt_message(hass, 'state-topic', '{"val":"beer on"}')
await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert STATE_ON == state.state assert STATE_ON == state.state
async_fire_mqtt_message(hass, 'state-topic', '{"val":"beer off"}') async_fire_mqtt_message(hass, 'state-topic', '{"val":"beer off"}')
await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert STATE_OFF == state.state assert STATE_OFF == state.state
@ -147,30 +140,22 @@ async def test_default_availability_payload(hass, mock_publish):
assert STATE_UNAVAILABLE == state.state assert STATE_UNAVAILABLE == state.state
async_fire_mqtt_message(hass, 'availability_topic', 'online') async_fire_mqtt_message(hass, 'availability_topic', 'online')
await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert STATE_OFF == state.state assert STATE_OFF == state.state
assert not state.attributes.get(ATTR_ASSUMED_STATE) assert not state.attributes.get(ATTR_ASSUMED_STATE)
async_fire_mqtt_message(hass, 'availability_topic', 'offline') async_fire_mqtt_message(hass, 'availability_topic', 'offline')
await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert STATE_UNAVAILABLE == state.state assert STATE_UNAVAILABLE == state.state
async_fire_mqtt_message(hass, 'state-topic', '1') async_fire_mqtt_message(hass, 'state-topic', '1')
await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert STATE_UNAVAILABLE == state.state assert STATE_UNAVAILABLE == state.state
async_fire_mqtt_message(hass, 'availability_topic', 'online') async_fire_mqtt_message(hass, 'availability_topic', 'online')
await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert STATE_ON == state.state assert STATE_ON == state.state
@ -196,29 +181,22 @@ async def test_custom_availability_payload(hass, mock_publish):
assert STATE_UNAVAILABLE == state.state assert STATE_UNAVAILABLE == state.state
async_fire_mqtt_message(hass, 'availability_topic', 'good') async_fire_mqtt_message(hass, 'availability_topic', 'good')
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert STATE_OFF == state.state assert STATE_OFF == state.state
assert not state.attributes.get(ATTR_ASSUMED_STATE) assert not state.attributes.get(ATTR_ASSUMED_STATE)
async_fire_mqtt_message(hass, 'availability_topic', 'nogood') async_fire_mqtt_message(hass, 'availability_topic', 'nogood')
await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert STATE_UNAVAILABLE == state.state assert STATE_UNAVAILABLE == state.state
async_fire_mqtt_message(hass, 'state-topic', '1') async_fire_mqtt_message(hass, 'state-topic', '1')
await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert STATE_UNAVAILABLE == state.state assert STATE_UNAVAILABLE == state.state
async_fire_mqtt_message(hass, 'availability_topic', 'good') async_fire_mqtt_message(hass, 'availability_topic', 'good')
await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert STATE_ON == state.state assert STATE_ON == state.state
@ -244,15 +222,11 @@ async def test_custom_state_payload(hass, mock_publish):
assert not state.attributes.get(ATTR_ASSUMED_STATE) assert not state.attributes.get(ATTR_ASSUMED_STATE)
async_fire_mqtt_message(hass, 'state-topic', 'HIGH') async_fire_mqtt_message(hass, 'state-topic', 'HIGH')
await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert STATE_ON == state.state assert STATE_ON == state.state
async_fire_mqtt_message(hass, 'state-topic', 'LOW') async_fire_mqtt_message(hass, 'state-topic', 'LOW')
await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert STATE_OFF == state.state assert STATE_OFF == state.state
@ -270,7 +244,6 @@ async def test_setting_attribute_via_mqtt_json_message(hass, mqtt_mock):
}) })
async_fire_mqtt_message(hass, 'attr-topic', '{ "val": "100" }') async_fire_mqtt_message(hass, 'attr-topic', '{ "val": "100" }')
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert '100' == state.attributes.get('val') assert '100' == state.attributes.get('val')
@ -288,7 +261,6 @@ async def test_update_with_json_attrs_not_dict(hass, mqtt_mock, caplog):
}) })
async_fire_mqtt_message(hass, 'attr-topic', '[ "list", "of", "things"]') async_fire_mqtt_message(hass, 'attr-topic', '[ "list", "of", "things"]')
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert state.attributes.get('val') is None assert state.attributes.get('val') is None
@ -307,7 +279,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') async_fire_mqtt_message(hass, 'attr-topic', 'This is not JSON')
await hass.async_block_till_done()
state = hass.states.get('switch.test') state = hass.states.get('switch.test')
assert state.attributes.get('val') is None assert state.attributes.get('val') is None
@ -332,8 +303,6 @@ async def test_discovery_update_attr(hass, mqtt_mock, caplog):
data1) data1)
await hass.async_block_till_done() await hass.async_block_till_done()
async_fire_mqtt_message(hass, 'attr-topic1', '{ "val": "100" }') 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('switch.beer') state = hass.states.get('switch.beer')
assert '100' == state.attributes.get('val') assert '100' == state.attributes.get('val')
@ -341,19 +310,14 @@ async def test_discovery_update_attr(hass, mqtt_mock, caplog):
async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config', async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config',
data2) data2)
await hass.async_block_till_done() await hass.async_block_till_done()
await hass.async_block_till_done()
# Verify we are no longer subscribing to the old topic # Verify we are no longer subscribing to the old topic
async_fire_mqtt_message(hass, 'attr-topic1', '{ "val": "50" }') 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('switch.beer') state = hass.states.get('switch.beer')
assert '100' == state.attributes.get('val') assert '100' == state.attributes.get('val')
# Verify we are subscribing to the new topic # Verify we are subscribing to the new topic
async_fire_mqtt_message(hass, 'attr-topic2', '{ "val": "75" }') 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('switch.beer') state = hass.states.get('switch.beer')
assert '75' == state.attributes.get('val') assert '75' == state.attributes.get('val')
@ -378,8 +342,6 @@ async def test_unique_id(hass):
}) })
async_fire_mqtt_message(hass, 'test-topic', 'payload') async_fire_mqtt_message(hass, 'test-topic', 'payload')
await hass.async_block_till_done()
await hass.async_block_till_done()
assert len(hass.states.async_entity_ids()) == 2 assert len(hass.states.async_entity_ids()) == 2
# all switches group is 1, unique id created is 1 # all switches group is 1, unique id created is 1
@ -399,7 +361,6 @@ async def test_discovery_removal_switch(hass, mqtt_mock, caplog):
async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config', async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config',
data) data)
await hass.async_block_till_done() await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.beer') state = hass.states.get('switch.beer')
assert state is not None assert state is not None
@ -408,7 +369,6 @@ async def test_discovery_removal_switch(hass, mqtt_mock, caplog):
async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config', async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config',
'') '')
await hass.async_block_till_done() await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.beer') state = hass.states.get('switch.beer')
assert state is None assert state is None
@ -441,7 +401,6 @@ async def test_discovery_update_switch(hass, mqtt_mock, caplog):
async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config', async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config',
data2) data2)
await hass.async_block_till_done() await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.beer') state = hass.states.get('switch.beer')
assert state is not None assert state is not None
@ -474,7 +433,6 @@ async def test_discovery_broken(hass, mqtt_mock, caplog):
async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config', async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config',
data2) data2)
await hass.async_block_till_done() await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.milk') state = hass.states.get('switch.milk')
assert state is not None assert state is not None
@ -510,7 +468,6 @@ async def test_entity_device_info_with_identifier(hass, mqtt_mock):
async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config', async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config',
data) data)
await hass.async_block_till_done() await hass.async_block_till_done()
await hass.async_block_till_done()
device = registry.async_get_device({('mqtt', 'helloworld')}, set()) device = registry.async_get_device({('mqtt', 'helloworld')}, set())
assert device is not None assert device is not None
@ -551,7 +508,6 @@ async def test_entity_device_info_update(hass, mqtt_mock):
async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config', async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config',
data) data)
await hass.async_block_till_done() await hass.async_block_till_done()
await hass.async_block_till_done()
device = registry.async_get_device({('mqtt', 'helloworld')}, set()) device = registry.async_get_device({('mqtt', 'helloworld')}, set())
assert device is not None assert device is not None
@ -562,7 +518,6 @@ async def test_entity_device_info_update(hass, mqtt_mock):
async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config', async_fire_mqtt_message(hass, 'homeassistant/switch/bla/config',
data) data)
await hass.async_block_till_done() await hass.async_block_till_done()
await hass.async_block_till_done()
device = registry.async_get_device({('mqtt', 'helloworld')}, set()) device = registry.async_get_device({('mqtt', 'helloworld')}, set())
assert device is not None assert device is not None
@ -593,7 +548,6 @@ async def test_entity_id_update(hass, mqtt_mock):
registry.async_update_entity('switch.beer', new_entity_id='switch.milk') registry.async_update_entity('switch.beer', new_entity_id='switch.milk')
await hass.async_block_till_done() await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('switch.beer') state = hass.states.get('switch.beer')
assert state is None assert state is None