Add add entry unload support for notify platform

Author: jbouwh

homeassistant/components/mqtt/__init__.py

@@ -1311,3 +1311,11 @@ async def async_remove_config_entry_device(
 
     await device_automation.async_removed_from_device(hass, device_entry.id)
     return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    if unload_ok:
+        pass
+    return unload_ok

homeassistant/components/mqtt/mixins.py

@@ -571,7 +571,6 @@ async def async_discovery_update(
         async def async_device_removed(event):
             """Handle the removal of a device."""
             nonlocal _device_removed
-            nonlocal _device_removed
             if _device_removed or not async_removed_from_device(
                 hass, event, device_id, config_entry_id
             ):
@@ -598,11 +597,24 @@ async def _async_tear_down() -> None:
             )
             del self
 
+        @callback
+        def _entry_unload(*_: Any) -> None:
+            """Handle the unload of the config entry."""
+            nonlocal self
+            # cleanup discovery
+            async_dispatcher_send(
+                hass, MQTT_DISCOVERY_DONE.format(discovery_hash), None
+            )
+            clear_discovery_hash(hass, discovery_hash)
+            _remove_discovery()
+            hass.async_create_task(self.async_tear_down())
+
         _remove_discovery = async_dispatcher_connect(
             hass,
             MQTT_DISCOVERY_UPDATED.format(discovery_hash),
             async_discovery_update,
         )
+        config_entry.async_on_unload(_entry_unload)
         if device_id is not None:
             self._remove_device_updated = hass.bus.async_listen(
                 EVENT_DEVICE_REGISTRY_UPDATED, async_device_removed

tests/components/mqtt/test_notify.py

@@ -6,7 +6,7 @@
 import pytest
 import yaml
 
-from homeassistant import config as hass_config
+from homeassistant import config as hass_config, config_entries
 from homeassistant.components import notify
 from homeassistant.components.mqtt import DOMAIN
 from homeassistant.const import CONF_NAME, SERVICE_RELOAD
@@ -688,7 +688,6 @@ async def test_publishing_with_custom_encoding(hass, mqtt_mock, caplog):
     await hass.async_block_till_done()
 
     assert not hass.services.has_service(notify.DOMAIN, "test3")
-    assert "<Event service_removed[L]: domain=notify, service=test3>" in caplog.text
 
 
 async def test_reloadable(hass, mqtt_mock, caplog, tmp_path):
@@ -772,3 +771,29 @@ async def test_reloadable(hass, mqtt_mock, caplog, tmp_path):
     await hass.async_block_till_done()
 
     assert not hass.services.has_service(notify.DOMAIN, "test_old_3")
+
+
+async def test_unload_entry(hass, mqtt_mock):
+    """Test unloading an entry."""
+    # discover a notify service
+    data = '{"name": "Test me", "command_topic": "test_topic_discovery" }'
+    async_fire_mqtt_message(hass, f"homeassistant/{notify.DOMAIN}/bla/config", data)
+    await hass.async_block_till_done()
+
+    assert hass.services.has_service(notify.DOMAIN, "test_me")
+    assert await config_entries.support_entry_unload(hass, DOMAIN)
+
+    # get the config_entry and unload it
+    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
+
+    await config_entry.async_unload(hass)
+    await hass.async_block_till_done()
+
+    # test if auto discovered item did not survive the platform unload
+    with pytest.raises(ServiceNotFound):
+        await hass.services.async_call(
+            notify.DOMAIN,
+            "test_me",
+            {notify.ATTR_TITLE: "Title", notify.ATTR_MESSAGE: "Message"},
+            blocking=True,
+        )