Cleanup mqtt discovery code (#112749)

* Cleanup mqtt discovery code

* Cleanup mqtt discovery code
This commit is contained in:
Jan Bouwhuis 2024-03-09 11:54:27 +01:00 committed by GitHub
parent a2180b16c3
commit 87318c9111
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 13 deletions

View file

@ -55,10 +55,9 @@ async def test_subscribing_config_topic(
) -> None:
"""Test setting up discovery."""
mqtt_mock = await mqtt_mock_entry()
entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
discovery_topic = "homeassistant"
await async_start(hass, discovery_topic, entry)
await async_start(hass, discovery_topic)
call_args1 = mqtt_mock.async_subscribe.mock_calls[0][1]
assert call_args1[2] == 0
@ -1503,14 +1502,13 @@ async def test_mqtt_integration_discovery_subscribe_unsubscribe(
mqtt_mock = await mqtt_mock_entry()
mock_platform(hass, "comp.config_flow", None)
entry = hass.config_entries.async_entries("mqtt")[0]
mqtt_mock().connected = True
with patch(
"homeassistant.components.mqtt.discovery.async_get_mqtt",
return_value={"comp": ["comp/discovery/#"]},
):
await async_start(hass, "homeassistant", entry)
await async_start(hass, "homeassistant")
await hass.async_block_till_done()
await hass.async_block_till_done()
@ -1553,14 +1551,13 @@ async def test_mqtt_discovery_unsubscribe_once(
mqtt_mock = await mqtt_mock_entry()
mock_platform(hass, "comp.config_flow", None)
entry = hass.config_entries.async_entries("mqtt")[0]
mqtt_mock().connected = True
with patch(
"homeassistant.components.mqtt.discovery.async_get_mqtt",
return_value={"comp": ["comp/discovery/#"]},
):
await async_start(hass, "homeassistant", entry)
await async_start(hass, "homeassistant")
await hass.async_block_till_done()
await hass.async_block_till_done()