Fix MQTT debug info for same topic (#34952)
This commit is contained in:
1 parent
9ccd56c019
commit
b68228c7e8
2 files changed
+109
-9
No files matched your search
@@ -960,6 +960,42 @@ async def test_mqtt_ws_remove_discovered_device_twice(
|
||||
assert response["error"]["code"] == websocket_api.const.ERR_NOT_FOUND
|
||||
|
||||
|
||||
async def test_mqtt_ws_remove_discovered_device_same_topic(
|
||||
hass, device_reg, hass_ws_client, mqtt_mock
|
||||
):
|
||||
"""Test MQTT websocket device removal."""
|
||||
config_entry = MockConfigEntry(domain=mqtt.DOMAIN)
|
||||
config_entry.add_to_hass(hass)
|
||||
await async_start(hass, "homeassistant", {}, config_entry)
|
||||
|
||||
data = (
|
||||
'{ "device":{"identifiers":["0AFFD2"]},'
|
||||
' "state_topic": "foobar/sensor",'
|
||||
' "availability_topic": "foobar/sensor",'
|
||||
' "unique_id": "unique" }'
|
||||
)
|
||||
|
||||
async_fire_mqtt_message(hass, "homeassistant/sensor/bla/config", data)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
device_entry = device_reg.async_get_device({("mqtt", "0AFFD2")}, set())
|
||||
assert device_entry is not None
|
||||
|
||||
client = await hass_ws_client(hass)
|
||||
await client.send_json(
|
||||
{"id": 5, "type": "mqtt/device/remove", "device_id": device_entry.id}
|
||||
)
|
||||
response = await client.receive_json()
|
||||
assert response["success"]
|
||||
|
||||
await client.send_json(
|
||||
{"id": 6, "type": "mqtt/device/remove", "device_id": device_entry.id}
|
||||
)
|
||||
response = await client.receive_json()
|
||||
assert not response["success"]
|
||||
assert response["error"]["code"] == websocket_api.const.ERR_NOT_FOUND
|
||||
|
||||
|
||||
async def test_mqtt_ws_remove_non_mqtt_device(
|
||||
hass, device_reg, hass_ws_client, mqtt_mock
|
||||
):
|
||||
@@ -1306,7 +1342,60 @@ async def test_debug_info_filter_same(hass, mqtt_mock):
|
||||
assert {
|
||||
"topic": "sensor/#",
|
||||
"messages": [
|
||||
{"topic": "sensor/abc", "payload": "123", "time": dt1},
|
||||
{"topic": "sensor/abc", "payload": "123", "time": dt2},
|
||||
{"payload": "123", "time": dt1, "topic": "sensor/abc"},
|
||||
{"payload": "123", "time": dt2, "topic": "sensor/abc"},
|
||||
],
|
||||
} == debug_info_data["entities"][0]["subscriptions"][0]
|
||||
|
||||
|
||||
async def test_debug_info_same_topic(hass, mqtt_mock):
|
||||
"""Test debug info."""
|
||||
config = {
|
||||
"device": {"identifiers": ["helloworld"]},
|
||||
"platform": "mqtt",
|
||||
"name": "test",
|
||||
"state_topic": "sensor/status",
|
||||
"availability_topic": "sensor/status",
|
||||
"unique_id": "veryunique",
|
||||
}
|
||||
|
||||
entry = MockConfigEntry(domain=mqtt.DOMAIN)
|
||||
entry.add_to_hass(hass)
|
||||
await async_start(hass, "homeassistant", {}, entry)
|
||||
registry = await hass.helpers.device_registry.async_get_registry()
|
||||
|
||||
data = json.dumps(config)
|
||||
async_fire_mqtt_message(hass, "homeassistant/sensor/bla/config", data)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
device = registry.async_get_device({("mqtt", "helloworld")}, set())
|
||||
assert device is not None
|
||||
|
||||
debug_info_data = await debug_info.info_for_device(hass, device.id)
|
||||
assert len(debug_info_data["entities"][0]["subscriptions"]) >= 1
|
||||
assert {"topic": "sensor/status", "messages": []} in debug_info_data["entities"][0][
|
||||
"subscriptions"
|
||||
]
|
||||
|
||||
start_dt = datetime(2019, 1, 1, 0, 0, 0)
|
||||
with patch("homeassistant.util.dt.utcnow") as dt_utcnow:
|
||||
dt_utcnow.return_value = start_dt
|
||||
async_fire_mqtt_message(hass, "sensor/status", "123", qos=0, retain=False)
|
||||
|
||||
debug_info_data = await debug_info.info_for_device(hass, device.id)
|
||||
assert len(debug_info_data["entities"][0]["subscriptions"]) == 1
|
||||
assert {
|
||||
"payload": "123",
|
||||
"time": start_dt,
|
||||
"topic": "sensor/status",
|
||||
} in debug_info_data["entities"][0]["subscriptions"][0]["messages"]
|
||||
|
||||
config["availability_topic"] = "sensor/availability"
|
||||
data = json.dumps(config)
|
||||
async_fire_mqtt_message(hass, "homeassistant/sensor/bla/config", data)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
start_dt = datetime(2019, 1, 1, 0, 0, 0)
|
||||
with patch("homeassistant.util.dt.utcnow") as dt_utcnow:
|
||||
dt_utcnow.return_value = start_dt
|
||||
async_fire_mqtt_message(hass, "sensor/status", "123", qos=0, retain=False)
|
||||
Reference in new issue
Block a user