Add Samsung TV via ExLink integration

Add a new integration to control Samsung consumer TVs over their RS-232
ExLink serial port, backed by the samsung-exlink library. Provides a
media player entity with power, volume, mute, and input source control.

A powered-off TV does not answer status queries; this is treated as the
TV being off rather than unavailable, and the source/volume/mute controls
are only offered while the TV is on.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

.strict-typing

@@ -496,6 +496,7 @@ homeassistant.components.rss_feed_template.*
 homeassistant.components.russound_rio.*
 homeassistant.components.ruuvi_gateway.*
 homeassistant.components.ruuvitag_ble.*
+homeassistant.components.samsung_exlink.*
 homeassistant.components.samsung_infrared.*
 homeassistant.components.samsungtv.*
 homeassistant.components.saunum.*
@@ -642,6 +643,7 @@ homeassistant.components.xbox.*
 homeassistant.components.xiaomi_ble.*
 homeassistant.components.yale_smart_alarm.*
 homeassistant.components.yalexs_ble.*
+homeassistant.components.yoto.*
 homeassistant.components.youtube.*
 homeassistant.components.zeroconf.*
 homeassistant.components.zinvolt.*

CODEOWNERS

@@ -1555,6 +1555,8 @@ CLAUDE.md @home-assistant/core
 /homeassistant/components/sabnzbd/ @shaiu @jpbede
 /tests/components/sabnzbd/ @shaiu @jpbede
 /homeassistant/components/saj/ @fredericvl
+/homeassistant/components/samsung_exlink/ @balloob
+/tests/components/samsung_exlink/ @balloob
 /homeassistant/components/samsung_infrared/ @lmaertin
 /tests/components/samsung_infrared/ @lmaertin
 /homeassistant/components/samsungtv/ @chemelli74

homeassistant/brands/samsung.json

@@ -1,5 +1,11 @@
 {
   "domain": "samsung",
   "name": "Samsung",
-  "integrations": ["familyhub", "samsung_infrared", "samsungtv", "syncthru"]
+  "integrations": [
+    "familyhub",
+    "samsung_exlink",
+    "samsung_infrared",
+    "samsungtv",
+    "syncthru"
+  ]
 }

homeassistant/components/airos/__init__.py

@@ -30,7 +30,7 @@ from homeassistant.exceptions import (
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import DEFAULT_SSL, DEFAULT_VERIFY_SSL, DOMAIN, SECTION_ADVANCED_SETTINGS
+from .const import DEFAULT_SSL, DEFAULT_VERIFY_SSL, DOMAIN, SECTION_ADDITIONAL_SETTINGS
 from .coordinator import (
     AirOSConfigEntry,
     AirOSDataUpdateCoordinator,
@@ -55,14 +55,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> boo
     # By default airOS 8 comes with self-signed SSL certificates,
     # with no option in the web UI to change or upload a custom certificate.
     session = async_get_clientsession(
-        hass, verify_ssl=entry.data[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL]
+        hass, verify_ssl=entry.data[SECTION_ADDITIONAL_SETTINGS][CONF_VERIFY_SSL]
     )
 
     conn_data = {
         CONF_HOST: entry.data[CONF_HOST],
         CONF_USERNAME: entry.data[CONF_USERNAME],
         CONF_PASSWORD: entry.data[CONF_PASSWORD],
-        "use_ssl": entry.data[SECTION_ADVANCED_SETTINGS][CONF_SSL],
+        "use_ssl": entry.data[SECTION_ADDITIONAL_SETTINGS][CONF_SSL],
         "session": session,
     }
 
@@ -116,15 +116,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> boo
 async def async_migrate_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> bool:
     """Migrate old config entry."""
 
-    # 1.1 Migrate config_entry to add advanced ssl settings
+    # 1.1 Migrate config_entry to add additional ssl settings
     if entry.version == 1 and entry.minor_version == 1:
         new_minor_version = 2
         new_data = {**entry.data}
-        advanced_data = {
+        additional_data = {
             CONF_SSL: DEFAULT_SSL,
             CONF_VERIFY_SSL: DEFAULT_VERIFY_SSL,
         }
-        new_data[SECTION_ADVANCED_SETTINGS] = advanced_data
+        new_data[SECTION_ADDITIONAL_SETTINGS] = additional_data
 
         hass.config_entries.async_update_entry(
             entry,

homeassistant/components/airos/config_flow.py

@@ -52,7 +52,7 @@ from .const import (
     HOSTNAME,
     IP_ADDRESS,
     MAC_ADDRESS,
-    SECTION_ADVANCED_SETTINGS,
+    SECTION_ADDITIONAL_SETTINGS,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -66,7 +66,7 @@ STEP_DISCOVERY_DATA_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_USERNAME, default=DEFAULT_USERNAME): str,
         vol.Required(CONF_PASSWORD): str,
-        vol.Required(SECTION_ADVANCED_SETTINGS): section(
+        vol.Required(SECTION_ADDITIONAL_SETTINGS): section(
             vol.Schema(
                 {
                     vol.Required(CONF_SSL, default=DEFAULT_SSL): bool,
@@ -134,7 +134,7 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
         # with no option in the web UI to change or upload a custom certificate.
         session = async_get_clientsession(
             self.hass,
-            verify_ssl=config_data[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL],
+            verify_ssl=config_data[SECTION_ADDITIONAL_SETTINGS][CONF_VERIFY_SSL],
         )
 
         try:
@@ -143,7 +143,7 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
                 username=config_data[CONF_USERNAME],
                 password=config_data[CONF_PASSWORD],
                 session=session,
-                use_ssl=config_data[SECTION_ADVANCED_SETTINGS][CONF_SSL],
+                use_ssl=config_data[SECTION_ADDITIONAL_SETTINGS][CONF_SSL],
             )
 
         except (
@@ -234,18 +234,18 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
                             autocomplete="current-password",
                         )
                     ),
-                    vol.Required(SECTION_ADVANCED_SETTINGS): section(
+                    vol.Required(SECTION_ADDITIONAL_SETTINGS): section(
                         vol.Schema(
                             {
                                 vol.Required(
                                     CONF_SSL,
-                                    default=current_data[SECTION_ADVANCED_SETTINGS][
+                                    default=current_data[SECTION_ADDITIONAL_SETTINGS][
                                         CONF_SSL
                                     ],
                                 ): bool,
                                 vol.Required(
                                     CONF_VERIFY_SSL,
-                                    default=current_data[SECTION_ADVANCED_SETTINGS][
+                                    default=current_data[SECTION_ADDITIONAL_SETTINGS][
                                         CONF_VERIFY_SSL
                                     ],
                                 ): bool,

homeassistant/components/airos/const.py

@@ -12,7 +12,7 @@ MANUFACTURER = "Ubiquiti"
 DEFAULT_VERIFY_SSL = False
 DEFAULT_SSL = True
 
-SECTION_ADVANCED_SETTINGS = "advanced_settings"
+SECTION_ADDITIONAL_SETTINGS = "additional_settings"
 
 # Discovery related
 DEFAULT_USERNAME = "ubnt"

homeassistant/components/airos/entity.py

@@ -4,7 +4,7 @@ from homeassistant.const import CONF_HOST, CONF_SSL
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import DOMAIN, MANUFACTURER, SECTION_ADVANCED_SETTINGS
+from .const import DOMAIN, MANUFACTURER, SECTION_ADDITIONAL_SETTINGS
 from .coordinator import AirOSDataUpdateCoordinator
 
 
@@ -20,7 +20,7 @@ class AirOSEntity(CoordinatorEntity[AirOSDataUpdateCoordinator]):
         airos_data = self.coordinator.data
         url_schema = (
             "https"
-            if coordinator.config_entry.data[SECTION_ADVANCED_SETTINGS][CONF_SSL]
+            if coordinator.config_entry.data[SECTION_ADDITIONAL_SETTINGS][CONF_SSL]
             else "http"
         )
 

homeassistant/components/airos/strings.json

@@ -33,16 +33,16 @@
         },
         "description": "Enter the username and password for {device_name}",
         "sections": {
-          "advanced_settings": {
+          "additional_settings": {
             "data": {
-              "ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data::ssl%]",
+              "ssl": "[%key:component::airos::config::step::manual::sections::additional_settings::data::ssl%]",
               "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
             },
             "data_description": {
-              "ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data_description::ssl%]",
-              "verify_ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data_description::verify_ssl%]"
+              "ssl": "[%key:component::airos::config::step::manual::sections::additional_settings::data_description::ssl%]",
+              "verify_ssl": "[%key:component::airos::config::step::manual::sections::additional_settings::data_description::verify_ssl%]"
             },
-            "name": "[%key:component::airos::config::step::manual::sections::advanced_settings::name%]"
+            "name": "[%key:component::airos::config::step::manual::sections::additional_settings::name%]"
           }
         }
       },
@@ -58,7 +58,7 @@
           "username": "Administrator username for the airOS device, normally 'ubnt'"
         },
         "sections": {
-          "advanced_settings": {
+          "additional_settings": {
             "data": {
               "ssl": "Use HTTPS",
               "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
@@ -67,7 +67,7 @@
               "ssl": "Whether the connection should be encrypted (required for most devices)",
               "verify_ssl": "Whether the certificate should be verified when using HTTPS. This should be off for self-signed certificates"
             },
-            "name": "Advanced settings"
+            "name": "Additional settings"
           }
         }
       },
@@ -87,16 +87,16 @@
           "password": "[%key:component::airos::config::step::manual::data_description::password%]"
         },
         "sections": {
-          "advanced_settings": {
+          "additional_settings": {
             "data": {
-              "ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data::ssl%]",
+              "ssl": "[%key:component::airos::config::step::manual::sections::additional_settings::data::ssl%]",
               "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
             },
             "data_description": {
-              "ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data_description::ssl%]",
-              "verify_ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data_description::verify_ssl%]"
+              "ssl": "[%key:component::airos::config::step::manual::sections::additional_settings::data_description::ssl%]",
+              "verify_ssl": "[%key:component::airos::config::step::manual::sections::additional_settings::data_description::verify_ssl%]"
             },
-            "name": "[%key:component::airos::config::step::manual::sections::advanced_settings::name%]"
+            "name": "[%key:component::airos::config::step::manual::sections::additional_settings::name%]"
           }
         }
       },

homeassistant/components/bang_olufsen/strings.json

@@ -1,6 +1,6 @@
 {
   "common": {
-    "jid_options_description": "Advanced grouping options, where devices' unique Beolink IDs (Called JIDs) are used directly. JIDs can be found in the state attributes of the media player entity.",
+    "jid_options_description": "Additional grouping options, where devices' unique Beolink IDs (Called JIDs) are used directly. JIDs can be found in the state attributes of the media player entity.",
     "jid_options_name": "JID options",
     "key_press": "Press",
     "key_release": "Release",

homeassistant/components/compit/climate.py

@@ -3,7 +3,7 @@
 import logging
 from typing import Any
 
-from compit_inext_api import Param, Parameter
+from compit_inext_api import Parameter
 from compit_inext_api.consts import (
     CompitFanMode,
     CompitHVACMode,
@@ -150,7 +150,7 @@ class CompitClimate(CoordinatorEntity[CompitDataUpdateCoordinator], ClimateEntit
         value = self.get_parameter_value(CompitParameter.CURRENT_TEMPERATURE)
         if value is None:
             return None
-        return float(value.value)
+        return float(value)
 
     @property
     def target_temperature(self) -> float | None:
@@ -158,7 +158,7 @@ class CompitClimate(CoordinatorEntity[CompitDataUpdateCoordinator], ClimateEntit
         value = self.get_parameter_value(CompitParameter.SET_TARGET_TEMPERATURE)
         if value is None:
             return None
-        return float(value.value)
+        return float(value)
 
     @cached_property
     def preset_modes(self) -> list[str] | None:
@@ -195,27 +195,24 @@ class CompitClimate(CoordinatorEntity[CompitDataUpdateCoordinator], ClimateEntit
         """Return the current preset mode."""
         preset_mode = self.get_parameter_value(CompitParameter.PRESET_MODE)
 
-        if preset_mode:
-            compit_preset_mode = CompitPresetMode(preset_mode.value)
-            return COMPIT_PRESET_MAP.get(compit_preset_mode)
+        if preset_mode is not None:
+            return COMPIT_PRESET_MAP.get(CompitPresetMode(preset_mode))
         return None
 
     @property
     def fan_mode(self) -> str | None:
         """Return the current fan mode."""
         fan_mode = self.get_parameter_value(CompitParameter.FAN_MODE)
-        if fan_mode:
-            compit_fan_mode = CompitFanMode(fan_mode.value)
-            return COMPIT_FANSPEED_MAP.get(compit_fan_mode)
+        if fan_mode is not None:
+            return COMPIT_FANSPEED_MAP.get(CompitFanMode(fan_mode))
         return None
 
     @property
     def hvac_mode(self) -> HVACMode | None:
         """Return the current HVAC mode."""
         hvac_mode = self.get_parameter_value(CompitParameter.HVAC_MODE)
-        if hvac_mode:
-            compit_hvac_mode = CompitHVACMode(hvac_mode.value)
-            return COMPIT_MODE_MAP.get(compit_hvac_mode)
+        if hvac_mode is not None:
+            return COMPIT_MODE_MAP.get(CompitHVACMode(hvac_mode))
         return None
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
@@ -258,8 +255,6 @@ class CompitClimate(CoordinatorEntity[CompitDataUpdateCoordinator], ClimateEntit
         )
         self.async_write_ha_state()
 
-    def get_parameter_value(self, parameter: CompitParameter) -> Param | None:
+    def get_parameter_value(self, parameter: CompitParameter) -> str | float | None:
         """Get the parameter value from the device state."""
-        return self.coordinator.connector.get_device_parameter(
-            self.device_id, parameter
-        )
+        return self.coordinator.connector.get_current_value(self.device_id, parameter)

homeassistant/components/compit/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["compit"],
   "quality_scale": "bronze",
-  "requirements": ["compit-inext-api==0.8.0"]
+  "requirements": ["compit-inext-api==0.9.1"]
 }

homeassistant/components/conversation/default_agent.py

@@ -852,7 +852,7 @@ class DefaultAgent(ConversationEntity):
                 )
 
         # Build filtered slot list
-        text_lower = text.strip().lower()
+        text_lower = remove_punctuation(text).strip().lower()
         return TextSlotList(
             name="name",
             values=[
@@ -889,7 +889,8 @@ class DefaultAgent(ConversationEntity):
             for name in intent.async_get_entity_aliases(
                 self.hass, entity_entry, state=state
             ):
-                yield (name, name, context)
+                # Strip punctuation so aliases match the cleaned input text.
+                yield (remove_punctuation(name).strip(), name, context)
 
     def _recognize_strict(
         self,
@@ -1162,7 +1163,7 @@ class DefaultAgent(ConversationEntity):
         areas = ar.async_get(self.hass)
         area_names = []
         for area in areas.async_list_areas():
-            area_names.append((area.name, area.name))
+            area_names.append((remove_punctuation(area.name).strip(), area.name))
             if not area.aliases:
                 continue
 
@@ -1171,13 +1172,13 @@ class DefaultAgent(ConversationEntity):
                 if not alias:
                     continue
 
-                area_names.append((alias, alias))
+                area_names.append((remove_punctuation(alias).strip(), alias))
 
         # Expose all floors.
         floors = fr.async_get(self.hass)
         floor_names = []
         for floor in floors.async_list_floors():
-            floor_names.append((floor.name, floor.name))
+            floor_names.append((remove_punctuation(floor.name).strip(), floor.name))
             if not floor.aliases:
                 continue
 
@@ -1186,7 +1187,7 @@ class DefaultAgent(ConversationEntity):
                 if not alias:
                     continue
 
-                floor_names.append((alias, floor.name))
+                floor_names.append((remove_punctuation(alias).strip(), floor.name))
 
         # Build trie
         self._exposed_names_trie = Trie()

homeassistant/components/edifier_infrared/__init__.py

@@ -4,7 +4,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-PLATFORMS = [Platform.BUTTON, Platform.MEDIA_PLAYER]
+PLATFORMS = [Platform.MEDIA_PLAYER]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:

homeassistant/components/edifier_infrared/button.py

@@ -1,180 +0,0 @@
-"""Button platform for Edifier infrared integration."""
-
-from dataclasses import dataclass
-
-from infrared_protocols.codes.edifier.models import EdifierCommandSet, EdifierModel
-from infrared_protocols.codes.edifier.r1280db import EdifierR1280DBCode
-from infrared_protocols.codes.edifier.r1700bt import EdifierR1700BTCode
-from infrared_protocols.codes.edifier.rc20g import EdifierRC20GCode
-from infrared_protocols.codes.edifier.s360db import EdifierS360DBCode
-
-from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
-from homeassistant.components.infrared import InfraredEmitterConsumerEntity
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_MODEL
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .const import CONF_COMMAND_SET, CONF_INFRARED_ENTITY_ID, EdifierCode
-from .entity import EdifierIrEntity
-
-PARALLEL_UPDATES = 1
-
-
-@dataclass(frozen=True, kw_only=True)
-class EdifierIrButtonEntityDescription(ButtonEntityDescription):
-    """Describes Edifier IR button entity."""
-
-    command_code: EdifierCode
-
-
-COMMAND_SET_BUTTONS: dict[
-    EdifierCommandSet,
-    tuple[EdifierIrButtonEntityDescription, ...],
-] = {
-    EdifierCommandSet.R1700BT: (
-        EdifierIrButtonEntityDescription(
-            key="bluetooth",
-            translation_key="bluetooth",
-            command_code=EdifierR1700BTCode.BLUETOOTH,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="line_1",
-            translation_key="line_1",
-            command_code=EdifierR1700BTCode.LINE_1,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="line_2",
-            translation_key="line_2",
-            command_code=EdifierR1700BTCode.LINE_2,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="fx_on",
-            translation_key="fx_on",
-            command_code=EdifierR1700BTCode.FX_ON,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="fx_off",
-            translation_key="fx_off",
-            command_code=EdifierR1700BTCode.FX_OFF,
-        ),
-    ),
-    EdifierCommandSet.R1280DB: (
-        EdifierIrButtonEntityDescription(
-            key="bluetooth",
-            translation_key="bluetooth",
-            command_code=EdifierR1280DBCode.BLUETOOTH,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="line_1",
-            translation_key="line_1",
-            command_code=EdifierR1280DBCode.LINE_1,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="line_2",
-            translation_key="line_2",
-            command_code=EdifierR1280DBCode.LINE_2,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="optical",
-            translation_key="optical",
-            command_code=EdifierR1280DBCode.OPTICAL,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="coax",
-            translation_key="coax",
-            command_code=EdifierR1280DBCode.COAX,
-        ),
-    ),
-    EdifierCommandSet.S360DB: (
-        EdifierIrButtonEntityDescription(
-            key="bluetooth",
-            translation_key="bluetooth",
-            command_code=EdifierS360DBCode.BLUETOOTH,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="optical",
-            translation_key="optical",
-            command_code=EdifierS360DBCode.OPTICAL,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="coax",
-            translation_key="coax",
-            command_code=EdifierS360DBCode.COAX,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="pc",
-            translation_key="pc",
-            command_code=EdifierS360DBCode.PC,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="aux",
-            translation_key="aux",
-            command_code=EdifierS360DBCode.AUX,
-        ),
-    ),
-    EdifierCommandSet.RC20G: (
-        EdifierIrButtonEntityDescription(
-            key="bluetooth",
-            translation_key="bluetooth",
-            command_code=EdifierRC20GCode.BLUETOOTH,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="pc",
-            translation_key="pc",
-            command_code=EdifierRC20GCode.PC,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="aux",
-            translation_key="aux",
-            command_code=EdifierRC20GCode.AUX,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="optical",
-            translation_key="optical",
-            command_code=EdifierRC20GCode.OPTICAL,
-        ),
-        EdifierIrButtonEntityDescription(
-            key="coax",
-            translation_key="coax",
-            command_code=EdifierRC20GCode.COAX,
-        ),
-    ),
-}
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Edifier IR buttons from a config entry."""
-    infrared_entity_id = entry.data[CONF_INFRARED_ENTITY_ID]
-    command_set = EdifierCommandSet(entry.data[CONF_COMMAND_SET])
-    model = EdifierModel(entry.data[CONF_MODEL])
-    async_add_entities(
-        EdifierIrButton(entry, model, infrared_entity_id, description)
-        for description in COMMAND_SET_BUTTONS.get(command_set, ())
-    )
-
-
-class EdifierIrButton(EdifierIrEntity, InfraredEmitterConsumerEntity, ButtonEntity):
-    """Edifier IR button entity."""
-
-    entity_description: EdifierIrButtonEntityDescription
-
-    def __init__(
-        self,
-        entry: ConfigEntry,
-        model: EdifierModel,
-        infrared_entity_id: str,
-        description: EdifierIrButtonEntityDescription,
-    ) -> None:
-        """Initialize Edifier IR button."""
-        super().__init__(entry, model, unique_id_suffix=description.key)
-        self._infrared_emitter_entity_id = infrared_entity_id
-        self.entity_description = description
-
-    async def async_press(self) -> None:
-        """Press the button."""
-        await self._send_command(self.entity_description.command_code.to_command())

homeassistant/components/edifier_infrared/strings.json

@@ -18,36 +18,5 @@
         "title": "Set up Edifier IR speaker"
       }
     }
-  },
-  "entity": {
-    "button": {
-      "aux": {
-        "name": "AUX"
-      },
-      "bluetooth": {
-        "name": "Bluetooth"
-      },
-      "coax": {
-        "name": "Coaxial"
-      },
-      "fx_off": {
-        "name": "FX off"
-      },
-      "fx_on": {
-        "name": "FX on"
-      },
-      "line_1": {
-        "name": "Line 1"
-      },
-      "line_2": {
-        "name": "Line 2"
-      },
-      "optical": {
-        "name": "Optical"
-      },
-      "pc": {
-        "name": "PC"
-      }
-    }
   }
 }

homeassistant/components/electrasmart/climate.py

@@ -25,7 +25,7 @@ from homeassistant.components.climate import (
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import ElectraSmartConfigEntry
@@ -145,6 +145,7 @@ class ElectraClimateEntity(ClimateEntity):
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, self._electra_ac_device.mac)},
+            connections={(CONNECTION_NETWORK_MAC, self._electra_ac_device.mac)},
             name=device.name,
             model=self._electra_ac_device.model,
             manufacturer=self._electra_ac_device.manufactor,

homeassistant/components/imap/strings.json

@@ -32,7 +32,7 @@
           "port": "[%key:common::config_flow::data::port%]",
           "search": "IMAP search",
           "server": "Server",
-          "ssl_cipher_list": "SSL cipher list (Advanced)",
+          "ssl_cipher_list": "SSL cipher list",
           "username": "[%key:common::config_flow::data::username%]",
           "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
         },

homeassistant/components/integration/sensor.py

@@ -2,7 +2,7 @@
 
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta
 from decimal import Decimal, InvalidOperation
 from enum import Enum
 import logging
@@ -49,6 +49,7 @@ from homeassistant.helpers.event import (
     async_track_state_report_event,
 )
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.util import dt as dt_util
 
 from .const import (
     CONF_MAX_SUB_INTERVAL,
@@ -339,8 +340,7 @@ class IntegrationSensor(RestoreSensor):
             else max_sub_interval
         )
         self._max_sub_interval_exceeded_callback: CALLBACK_TYPE = lambda *args: None
-        # pylint: disable-next=home-assistant-enforce-utcnow
-        self._last_integration_time: datetime = datetime.now(tz=UTC)
+        self._last_integration_time: datetime = dt_util.utcnow()
         self._last_integration_trigger = _IntegrationTrigger.StateEvent
         self._attr_suggested_display_precision = round_digits or 2
 
@@ -499,8 +499,7 @@ class IntegrationSensor(RestoreSensor):
                 old_timestamp, new_timestamp, old_state, new_state
             )
             self._last_integration_trigger = _IntegrationTrigger.StateEvent
-            # pylint: disable-next=home-assistant-enforce-utcnow
-            self._last_integration_time = datetime.now(tz=UTC)
+            self._last_integration_time = dt_util.utcnow()
         finally:
             # When max_sub_interval exceeds without state change the source is assumed
             # constant with the last known state (new_state).
@@ -608,8 +607,7 @@ class IntegrationSensor(RestoreSensor):
                 self._update_integral(area)
                 self.async_write_ha_state()
 
-                # pylint: disable-next=home-assistant-enforce-utcnow
-                self._last_integration_time = datetime.now(tz=UTC)
+                self._last_integration_time = dt_util.utcnow()
                 self._last_integration_trigger = _IntegrationTrigger.TimeElapsed
 
                 self._schedule_max_sub_interval_exceeded_if_state_is_numeric(

homeassistant/components/lg_infrared/__init__.py

@@ -1,11 +1,15 @@
 """LG IR Remote integration for Home Assistant."""
 
+import logging
+
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
 PLATFORMS = [Platform.BUTTON, Platform.EVENT, Platform.MEDIA_PLAYER]
 
+_LOGGER = logging.getLogger(__name__)
+
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up LG IR from a config entry."""
@@ -16,3 +20,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a LG IR config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Migrate old config entry."""
+    if entry.version == 1:
+        # v1 used the infrared entity_id in the entry's unique_id, which is
+        # not stable and was removed in v2.
+        _LOGGER.debug("Migrating config entry from version 1 to 2")
+        hass.config_entries.async_update_entry(entry, unique_id=None, version=2)
+
+    return True

homeassistant/components/lg_infrared/config_flow.py

@@ -1,6 +1,6 @@
 """Config flow for LG IR integration."""
 
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import voluptuous as vol
 
@@ -35,7 +35,7 @@ DEVICE_TYPE_NAMES: dict[LGDeviceType, str] = {
 class LgIrConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle config flow for LG IR."""
 
-    VERSION = 1
+    VERSION = 2
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -49,24 +49,39 @@ class LgIrConfigFlow(ConfigFlow, domain=DOMAIN):
         errors: dict[str, str] = {}
 
         if user_input is not None:
-            if entity_id := user_input.get(CONF_INFRARED_ENTITY_ID) or user_input.get(
-                CONF_INFRARED_RECEIVER_ENTITY_ID
-            ):
+            emitter_id = user_input.get(CONF_INFRARED_ENTITY_ID)
+            receiver_id = user_input.get(CONF_INFRARED_RECEIVER_ENTITY_ID)
+            if emitter_id or receiver_id:
                 device_type = user_input[CONF_DEVICE_TYPE]
 
-                await self.async_set_unique_id(f"lg_ir_{device_type}_{entity_id}")
-                self._abort_if_unique_id_configured()
+                if emitter_id:
+                    self._async_abort_entries_match(
+                        {
+                            CONF_DEVICE_TYPE: device_type,
+                            CONF_INFRARED_ENTITY_ID: emitter_id,
+                        }
+                    )
+                if receiver_id:
+                    self._async_abort_entries_match(
+                        {
+                            CONF_DEVICE_TYPE: device_type,
+                            CONF_INFRARED_RECEIVER_ENTITY_ID: receiver_id,
+                        }
+                    )
 
                 # Get entity name for the title
+                title_entity_id = emitter_id or receiver_id
+                if TYPE_CHECKING:
+                    assert title_entity_id is not None
                 ent_reg = er.async_get(self.hass)
-                entry = ent_reg.async_get(entity_id)
-                entity_name = (
-                    entry.name or entry.original_name or entity_id
+                entry = ent_reg.async_get(title_entity_id)
+                title_entity_name = (
+                    entry.name or entry.original_name or title_entity_id
                     if entry
-                    else entity_id
+                    else title_entity_id
                 )
                 device_type_name = DEVICE_TYPE_NAMES[LGDeviceType(device_type)]
-                title = f"LG {device_type_name} via {entity_name}"
+                title = f"LG {device_type_name} via {title_entity_name}"
 
                 return self.async_create_entry(title=title, data=user_input)
 

homeassistant/components/opower/manifest.json

@@ -9,5 +9,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["opower"],
   "quality_scale": "platinum",
-  "requirements": ["opower==0.18.4"]
+  "requirements": ["opower==0.18.5"]
 }

homeassistant/components/recorder/db_schema.py

@@ -308,17 +308,17 @@ class Events(Base):
     def from_event(event: Event) -> Events:
         """Create an event database object from a native event."""
         context = event.context
+        # The unused legacy columns (event_type, event_data, time_fired,
+        # context_id, context_user_id, context_parent_id) are nullable with no
+        # default, so they are intentionally left unset here. Assigning them
+        # None would still insert NULL, but each assignment goes through
+        # SQLAlchemy's instrumented attribute machinery, which is a measurable
+        # cost when run for every recorded event.
         return Events(
-            event_type=None,
-            event_data=None,
             origin_idx=event.origin.idx,
-            time_fired=None,
             time_fired_ts=event.time_fired_timestamp,
-            context_id=None,
             context_id_bin=ulid_to_bytes_or_none(context.id),
-            context_user_id=None,
             context_user_id_bin=uuid_hex_to_bytes_or_none(context.user_id),
-            context_parent_id=None,
             context_parent_id_bin=ulid_to_bytes_or_none(context.parent_id),
         )
 
@@ -491,19 +491,18 @@ class States(Base):
             else:
                 last_reported_ts = state.last_reported_timestamp
         context = event.context
+        # The unused legacy columns (entity_id, attributes, context_id,
+        # context_user_id, context_parent_id, last_updated, last_changed) are
+        # nullable with no default, so they are intentionally left unset here.
+        # Assigning them None would still insert NULL, but each assignment goes
+        # through SQLAlchemy's instrumented attribute machinery, which is a
+        # measurable cost when run for every recorded state change.
         return States(
             state=state_value,
-            entity_id=None,
-            attributes=None,
-            context_id=None,
             context_id_bin=ulid_to_bytes_or_none(context.id),
-            context_user_id=None,
             context_user_id_bin=uuid_hex_to_bytes_or_none(context.user_id),
-            context_parent_id=None,
             context_parent_id_bin=ulid_to_bytes_or_none(context.parent_id),
             origin_idx=event.origin.idx,
-            last_updated=None,
-            last_changed=None,
             last_updated_ts=last_updated_ts,
             last_changed_ts=last_changed_ts,
             last_reported_ts=last_reported_ts,
@@ -560,8 +559,13 @@ class StateAttributes(Base):
         # None state means the state was removed from the state machine
         if (state := event.data["new_state"]) is None:
             return b"{}"
-        if state_info := state.state_info:
-            unrecorded_attributes = state_info["unrecorded_attributes"]
+        if (state_info := state.state_info) and (
+            unrecorded_attributes := state_info["unrecorded_attributes"]
+        ):
+            # The entity has unrecorded attributes, so a combined exclude set
+            # has to be built. The common case (no unrecorded attributes) falls
+            # through to the shared constant below without allocating a set per
+            # recorded state change.
             exclude_attrs = {
                 *ALL_DOMAIN_EXCLUDE_ATTRS,
                 *unrecorded_attributes,

homeassistant/components/renson/entity.py

@@ -8,7 +8,7 @@ from renson_endura_delta.field_enum import (
 )
 from renson_endura_delta.renson import RensonVentilation
 
-from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -24,10 +24,11 @@ class RensonEntity(CoordinatorEntity[RensonCoordinator]):
         """Initialize the Renson entity."""
         super().__init__(coordinator)
 
+        mac = api.get_field_value(coordinator.data, MAC_ADDRESS.name)
+
         self._attr_device_info = DeviceInfo(
-            identifiers={
-                (DOMAIN, api.get_field_value(coordinator.data, MAC_ADDRESS.name))
-            },
+            identifiers={(DOMAIN, mac)},
+            connections={(CONNECTION_NETWORK_MAC, mac)},
             manufacturer="Renson",
             model=api.get_field_value(coordinator.data, DEVICE_NAME_FIELD.name),
             name="Ventilation",
@@ -41,6 +42,4 @@ class RensonEntity(CoordinatorEntity[RensonCoordinator]):
 
         self.api = api
 
-        self._attr_unique_id = (
-            api.get_field_value(coordinator.data, MAC_ADDRESS.name) + f"{name}"
-        )
+        self._attr_unique_id = f"{mac}{name}"

homeassistant/components/reolink/__init__.py

@@ -1,7 +1,7 @@
 """Reolink integration for HomeAssistant."""
 
 from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
+from datetime import timedelta
 import logging
 from random import uniform
 from time import time
@@ -26,6 +26,7 @@ from homeassistant.helpers import (
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.typing import ConfigType
+from homeassistant.util import dt as dt_util
 
 from .const import (
     BATTERY_PASSIVE_WAKE_UPDATE_INTERVAL,
@@ -192,7 +193,7 @@ async def async_setup_entry(
         hass.config_entries.async_update_entry(config_entry, data=data)
 
     # If camera WAN blocked, firmware check fails and takes long, do not prevent setup
-    now = datetime.now(UTC)  # pylint: disable=home-assistant-enforce-utcnow
+    now = dt_util.utcnow()
     check_time = timedelta(seconds=check_time_sec)
     delta_midnight = now - now.replace(hour=0, minute=0, second=0, microsecond=0)
     firmware_check_delay = check_time - delta_midnight

homeassistant/components/samsung_exlink/__init__.py

@@ -0,0 +1,61 @@
+"""The Samsung ExLink integration."""
+
+from samsung_exlink import MODELS, SamsungTV, TVState
+
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import CONF_DEVICE, CONF_MODEL, Platform
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import ConfigEntryNotReady
+
+from .const import DOMAIN, LOGGER, SamsungExLinkConfigEntry
+
+PLATFORMS = [Platform.MEDIA_PLAYER]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: SamsungExLinkConfigEntry
+) -> bool:
+    """Set up Samsung ExLink from a config entry."""
+    port = entry.data[CONF_DEVICE]
+    tv = SamsungTV(port, model=MODELS.get(entry.data.get(CONF_MODEL, "")))
+
+    try:
+        await tv.connect()
+        # refresh() tolerates a powered-off TV; it only raises on a broken link.
+        await tv.refresh()
+    except (ConnectionError, OSError, TimeoutError) as err:
+        if tv.connected:
+            await tv.disconnect()
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="cannot_connect",
+            translation_placeholders={"error": str(err)},
+        ) from err
+
+    entry.runtime_data = tv
+
+    @callback
+    def _on_disconnect(state: TVState | None) -> None:
+        # Only reload if the entry is still loaded. During entry removal,
+        # disconnect() fires this callback but the entry is already gone.
+        if state is None and entry.state is ConfigEntryState.LOADED:
+            LOGGER.warning("Samsung TV disconnected, reloading config entry")
+            hass.config_entries.async_schedule_reload(entry.entry_id)
+
+    entry.async_on_unload(tv.subscribe(_on_disconnect))
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    return True
+
+
+async def async_unload_entry(
+    hass: HomeAssistant, entry: SamsungExLinkConfigEntry
+) -> bool:
+    """Unload a config entry."""
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+    if unload_ok:
+        await entry.runtime_data.disconnect()
+
+    return unload_ok

homeassistant/components/samsung_exlink/config_flow.py

@@ -0,0 +1,113 @@
+"""Config flow for the Samsung ExLink integration."""
+
+from typing import Any
+
+from samsung_exlink import MODELS, SamsungTV, SamsungTVError, TVModel
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_DEVICE, CONF_MODEL
+from homeassistant.helpers.selector import (
+    SelectOptionDict,
+    SelectSelector,
+    SelectSelectorConfig,
+    SelectSelectorMode,
+    SerialPortSelector,
+)
+
+from .const import DOMAIN, LOGGER
+
+DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_DEVICE): SerialPortSelector(),
+        vol.Optional(CONF_MODEL): SelectSelector(
+            SelectSelectorConfig(
+                options=[
+                    SelectOptionDict(value=key, label=model.name)
+                    for key, model in MODELS.items()
+                ],
+                mode=SelectSelectorMode.DROPDOWN,
+            )
+        ),
+    }
+)
+
+# Outcome of _async_attempt_connect that means the serial port works but no
+# Samsung TV answered it; this routes the user to the troubleshooting step.
+RESULT_NO_TV = "no_tv"
+
+
+async def _async_attempt_connect(port: str, model: TVModel | None) -> str | None:
+    """Attempt to connect to the TV at the given port.
+
+    Returns None on success, otherwise an outcome key: "cannot_connect" when
+    the serial port could not be opened, RESULT_NO_TV when the port works but
+    no Samsung TV responded to it, or "unknown" for an unexpected error.
+    """
+    tv = SamsungTV(port, model=model)
+
+    try:
+        await tv.connect()
+    except ValueError, ConnectionError, OSError, TimeoutError:
+        # The serial port itself could not be opened.
+        return "cannot_connect"
+    except Exception:  # noqa: BLE001
+        LOGGER.exception("Unexpected exception")
+        return "unknown"
+
+    try:
+        await tv.query_power()
+    except TimeoutError, SamsungTVError:
+        # The port was opened but no Samsung TV responded to the power query.
+        return RESULT_NO_TV
+    except Exception:  # noqa: BLE001
+        LOGGER.exception("Unexpected exception")
+        return "unknown"
+    finally:
+        await tv.disconnect()
+
+    return None
+
+
+class SamsungExLinkConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Samsung ExLink."""
+
+    VERSION = 1
+
+    _user_input: dict[str, Any] | None = None
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            port = user_input[CONF_DEVICE]
+            model_key = user_input.get(CONF_MODEL)
+
+            self._async_abort_entries_match({CONF_DEVICE: port})
+            error = await _async_attempt_connect(port, MODELS.get(model_key or ""))
+            if error is None:
+                return self.async_create_entry(title="Samsung TV", data=user_input)
+            if error == RESULT_NO_TV:
+                self._user_input = user_input
+                return await self.async_step_troubleshoot()
+            errors["base"] = error
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=self.add_suggested_values_to_schema(
+                DATA_SCHEMA, user_input or self._user_input or {}
+            ),
+            errors=errors,
+        )
+
+    async def async_step_troubleshoot(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Guide the user to enable ExLink control after a failed connection."""
+        if user_input is not None:
+            return await self.async_step_user()
+
+        return self.async_show_form(step_id="troubleshoot")

homeassistant/components/samsung_exlink/const.py

@@ -0,0 +1,12 @@
+"""Constants for the Samsung ExLink integration."""
+
+import logging
+
+from samsung_exlink import SamsungTV
+
+from homeassistant.config_entries import ConfigEntry
+
+LOGGER = logging.getLogger(__package__)
+DOMAIN = "samsung_exlink"
+
+type SamsungExLinkConfigEntry = ConfigEntry[SamsungTV]

homeassistant/components/samsung_exlink/manifest.json

@@ -0,0 +1,13 @@
+{
+  "domain": "samsung_exlink",
+  "name": "Samsung TV via ExLink",
+  "codeowners": ["@balloob"],
+  "config_flow": true,
+  "dependencies": ["usb"],
+  "documentation": "https://www.home-assistant.io/integrations/samsung_exlink",
+  "integration_type": "device",
+  "iot_class": "local_polling",
+  "loggers": ["samsung_exlink"],
+  "quality_scale": "silver",
+  "requirements": ["samsung-exlink==1.1.0"]
+}

homeassistant/components/samsung_exlink/media_player.py

@@ -0,0 +1,196 @@
+"""Media player platform for the Samsung ExLink integration."""
+
+from collections.abc import Callable, Coroutine
+from datetime import timedelta
+from functools import wraps
+from typing import Any
+
+from samsung_exlink import MAX_VOLUME, CommandRejected, InputSource, TVState
+
+from homeassistant.components.media_player import (
+    MediaPlayerDeviceClass,
+    MediaPlayerEntity,
+    MediaPlayerEntityFeature,
+    MediaPlayerState,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .const import DOMAIN, SamsungExLinkConfigEntry
+
+# Samsung TVs do not push state over RS-232, so the entity is polled.
+SCAN_INTERVAL = timedelta(seconds=5)
+PARALLEL_UPDATES = 1
+
+INPUT_SOURCE_SAMSUNG_TO_HA: dict[InputSource, str] = {
+    InputSource.TV: "tv",
+    InputSource.AV1: "av1",
+    InputSource.AV2: "av2",
+    InputSource.AV3: "av3",
+    InputSource.S_VIDEO1: "s_video1",
+    InputSource.S_VIDEO2: "s_video2",
+    InputSource.S_VIDEO3: "s_video3",
+    InputSource.COMPONENT1: "component1",
+    InputSource.COMPONENT2: "component2",
+    InputSource.COMPONENT3: "component3",
+    InputSource.PC1: "pc1",
+    InputSource.PC2: "pc2",
+    InputSource.PC3: "pc3",
+    InputSource.HDMI1: "hdmi1",
+    InputSource.HDMI2: "hdmi2",
+    InputSource.HDMI3: "hdmi3",
+    InputSource.HDMI4: "hdmi4",
+    InputSource.DVI1: "dvi1",
+    InputSource.DVI2: "dvi2",
+    InputSource.DVI3: "dvi3",
+    InputSource.RVU: "rvu",
+}
+INPUT_SOURCE_HA_TO_SAMSUNG: dict[str, InputSource] = {
+    value: key for key, value in INPUT_SOURCE_SAMSUNG_TO_HA.items()
+}
+
+_BASE_SUPPORTED_FEATURES = (
+    MediaPlayerEntityFeature.TURN_ON | MediaPlayerEntityFeature.TURN_OFF
+)
+
+
+def catch_command_errors[**_P](
+    func: Callable[_P, Coroutine[Any, Any, None]],
+) -> Callable[_P, Coroutine[Any, Any, None]]:
+    """Translate Samsung library errors raised by an action into HomeAssistantError."""
+
+    @wraps(func)
+    async def wrapper(*args: _P.args, **kwargs: _P.kwargs) -> None:
+        try:
+            await func(*args, **kwargs)
+        except CommandRejected as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="command_rejected",
+                translation_placeholders={"error": str(err)},
+            ) from err
+        except (ConnectionError, OSError, TimeoutError) as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="command_failed",
+                translation_placeholders={"error": str(err)},
+            ) from err
+
+    return wrapper
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: SamsungExLinkConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the Samsung ExLink media player."""
+    async_add_entities([SamsungExLinkMediaPlayer(config_entry)])
+
+
+class SamsungExLinkMediaPlayer(MediaPlayerEntity):
+    """Representation of a Samsung TV controlled over ExLink (RS-232)."""
+
+    _attr_device_class = MediaPlayerDeviceClass.TV
+    _attr_has_entity_name = True
+    _attr_name = None
+    _attr_translation_key = "tv"
+    _attr_source_list = sorted(INPUT_SOURCE_SAMSUNG_TO_HA.values())
+
+    def __init__(self, config_entry: SamsungExLinkConfigEntry) -> None:
+        """Initialize the media player."""
+        self._tv = config_entry.runtime_data
+        self._attr_unique_id = config_entry.entry_id
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, config_entry.entry_id)},
+            manufacturer="Samsung",
+        )
+        self._async_update_from_state(self._tv.state)
+
+    async def async_added_to_hass(self) -> None:
+        """Subscribe to TV state updates."""
+        self.async_on_remove(self._tv.subscribe(self._async_on_state_update))
+
+    async def async_update(self) -> None:
+        """Poll the TV for its current state."""
+        await self._tv.refresh()
+
+    @callback
+    def _async_on_state_update(self, state: TVState | None) -> None:
+        """Handle a state update from the TV."""
+        if state is None:
+            self._attr_available = False
+        else:
+            self._attr_available = True
+            self._async_update_from_state(state)
+        self.async_write_ha_state()
+
+    @callback
+    def _async_update_from_state(self, state: TVState) -> None:
+        """Update entity attributes from a TV state snapshot."""
+        if state.power is None:
+            self._attr_state = None
+        else:
+            self._attr_state = (
+                MediaPlayerState.ON if state.power else MediaPlayerState.OFF
+            )
+
+        # A standby TV only accepts power-on over RS-232; source, volume, and
+        # mute commands time out. Those controls (and their attributes) are
+        # therefore only exposed while the TV is on, and volume/mute also
+        # require the value to be known.
+        features = _BASE_SUPPORTED_FEATURES
+        if state.power:
+            features |= MediaPlayerEntityFeature.SELECT_SOURCE
+            source = state.input_source
+            self._attr_source = (
+                INPUT_SOURCE_SAMSUNG_TO_HA.get(source) if source else None
+            )
+
+            if state.volume is None:
+                self._attr_volume_level = None
+            else:
+                features |= (
+                    MediaPlayerEntityFeature.VOLUME_SET
+                    | MediaPlayerEntityFeature.VOLUME_STEP
+                )
+                self._attr_volume_level = state.volume / MAX_VOLUME
+
+            if state.mute is None:
+                self._attr_is_volume_muted = None
+            else:
+                features |= MediaPlayerEntityFeature.VOLUME_MUTE
+                self._attr_is_volume_muted = state.mute
+        else:
+            self._attr_source = None
+            self._attr_volume_level = None
+            self._attr_is_volume_muted = None
+
+        self._attr_supported_features = features
+
+    @catch_command_errors
+    async def async_turn_on(self) -> None:
+        """Turn the TV on."""
+        await self._tv.power_on()
+
+    @catch_command_errors
+    async def async_turn_off(self) -> None:
+        """Turn the TV off."""
+        await self._tv.power_off()
+
+    @catch_command_errors
+    async def async_set_volume_level(self, volume: float) -> None:
+        """Set volume level, range 0..1."""
+        await self._tv.set_volume(round(volume * MAX_VOLUME))
+
+    @catch_command_errors
+    async def async_mute_volume(self, mute: bool) -> None:
+        """Mute or unmute the TV."""
+        await self._tv.set_mute(mute)
+
+    @catch_command_errors
+    async def async_select_source(self, source: str) -> None:
+        """Select an input source."""
+        await self._tv.select_input_source(INPUT_SOURCE_HA_TO_SAMSUNG[source])

homeassistant/components/samsung_exlink/quality_scale.yaml

@@ -0,0 +1,84 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: The integration does not register custom actions.
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: The integration does not register custom actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup: done
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions: done
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: The integration has no options to configure.
+  docs-installation-parameters: done
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: done
+  parallel-updates: done
+  reauthentication-flow:
+    status: exempt
+    comment: The integration does not require authentication.
+  test-coverage: done
+
+  # Gold
+  devices: done
+  diagnostics: todo
+  discovery-update-info:
+    status: exempt
+    comment: Serial devices are configured manually; there is no discovery.
+  discovery:
+    status: exempt
+    comment: RS-232 serial connections cannot be discovered.
+  docs-data-update: done
+  docs-examples: done
+  docs-known-limitations: done
+  docs-supported-devices: done
+  docs-supported-functions: done
+  docs-troubleshooting: done
+  docs-use-cases: done
+  dynamic-devices:
+    status: exempt
+    comment: The integration does not create dynamic devices.
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default:
+    status: exempt
+    comment: The integration only provides a single primary entity.
+  entity-translations: done
+  exception-translations: done
+  icon-translations:
+    status: exempt
+    comment: The media player entity uses its device class for its icon.
+  reconfiguration-flow: todo
+  repair-issues:
+    status: exempt
+    comment: The integration has no user-actionable issues to repair.
+  stale-devices:
+    status: exempt
+    comment: The integration does not create devices that can become stale.
+
+  # Platinum
+  async-dependency: done
+  inject-websession:
+    status: exempt
+    comment: The integration does not make HTTP requests.
+  strict-typing: done

homeassistant/components/samsung_exlink/strings.json

@@ -0,0 +1,72 @@
+{
+  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "step": {
+      "troubleshoot": {
+        "description": "Home Assistant could not communicate with the Samsung TV over the serial port.\n\nThe most common cause is that ExLink control is not enabled. On TVs that use the USB-to-ExLink dongle, **EXT Link Support** and **USB Serial** must be enabled in the hidden service menu (on the remote, press **Mute → 1 → 8 → 2 → Power**); the exact path varies by model, so check your TV's documentation.\n\nAlso make sure that:\n- The TV is powered on. A TV in standby does not answer status queries.\n- The cable is connected to the TV's 3.5 mm ExLink jack (or the Samsung USB-to-ExLink dongle) and is fully seated.\n- The correct serial port was selected.\n\nSelect **Submit** to try again.",
+        "title": "Connection failed"
+      },
+      "user": {
+        "data": {
+          "device": "[%key:common::config_flow::data::port%]",
+          "model": "TV generation"
+        },
+        "data_description": {
+          "device": "Serial port path to connect to.",
+          "model": "Select your TV's generation to translate the active input back into a named source. Leave empty if your model is not listed; you can still switch sources."
+        },
+        "description": "Make sure the TV is powered on before continuing. Home Assistant queries the TV during setup to confirm the connection, and a TV in standby will not respond."
+      }
+    }
+  },
+  "entity": {
+    "media_player": {
+      "tv": {
+        "state_attributes": {
+          "source": {
+            "state": {
+              "av1": "AV 1",
+              "av2": "AV 2",
+              "av3": "AV 3",
+              "component1": "Component 1",
+              "component2": "Component 2",
+              "component3": "Component 3",
+              "dvi1": "DVI 1",
+              "dvi2": "DVI 2",
+              "dvi3": "DVI 3",
+              "hdmi1": "HDMI 1",
+              "hdmi2": "HDMI 2",
+              "hdmi3": "HDMI 3",
+              "hdmi4": "HDMI 4",
+              "pc1": "PC 1",
+              "pc2": "PC 2",
+              "pc3": "PC 3",
+              "rvu": "RVU",
+              "s_video1": "S-Video 1",
+              "s_video2": "S-Video 2",
+              "s_video3": "S-Video 3",
+              "tv": "TV"
+            }
+          }
+        }
+      }
+    }
+  },
+  "exceptions": {
+    "cannot_connect": {
+      "message": "Error connecting to the Samsung TV: {error}"
+    },
+    "command_failed": {
+      "message": "Failed to send the command to the TV: {error}"
+    },
+    "command_rejected": {
+      "message": "The TV rejected the command: {error}"
+    }
+  }
+}

homeassistant/components/sensoterra/sensor.py

@@ -1,6 +1,6 @@
 """Sensoterra devices."""
 
-from datetime import UTC, datetime, timedelta
+from datetime import timedelta
 from enum import StrEnum, auto
 
 from sensoterra.probe import Probe, Sensor
@@ -22,6 +22,7 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.util import dt as dt_util
 
 from .const import CONFIGURATION_URL, DOMAIN, SENSOR_EXPIRATION_DAYS
 from .coordinator import SensoterraConfigEntry, SensoterraCoordinator
@@ -165,5 +166,5 @@ class SensoterraEntity(CoordinatorEntity[SensoterraCoordinator], SensorEntity):
             return False
 
         # Expire sensor if no update within the last few days.
-        expiration = datetime.now(UTC) - timedelta(days=SENSOR_EXPIRATION_DAYS)  # pylint: disable=home-assistant-enforce-utcnow
+        expiration = dt_util.utcnow() - timedelta(days=SENSOR_EXPIRATION_DAYS)
         return sensor.timestamp >= expiration

homeassistant/components/simplisafe/__init__.py

@@ -247,7 +247,7 @@ def _async_register_base_station(
         config_entry_id=entry.entry_id,
         identifiers={(DOMAIN, str(system.system_id))},
         manufacturer="SimpliSafe",
-        model=system.version,
+        model=str(system.version),
         name=system.address,
     )
 

homeassistant/components/sonos/media_player.py

@@ -21,7 +21,6 @@ from sonos_websocket.exception import SonosWebsocketError
 
 from homeassistant.components import media_source, spotify
 from homeassistant.components.media_player import (
-    ATTR_INPUT_SOURCE,
     ATTR_MEDIA_ALBUM_NAME,
     ATTR_MEDIA_ANNOUNCE,
     ATTR_MEDIA_ARTIST,
@@ -779,9 +778,6 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
         if self.media.queue_size:
             attributes["queue_size"] = self.media.queue_size
 
-        if self.source:
-            attributes[ATTR_INPUT_SOURCE] = self.source
-
         return attributes
 
     async def async_get_browse_image(

homeassistant/components/starlink/time.py

@@ -9,6 +9,7 @@ from homeassistant.components.time import TimeEntity, TimeEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .coordinator import StarlinkConfigEntry, StarlinkData, StarlinkUpdateCoordinator
 from .entity import StarlinkEntity
@@ -63,8 +64,7 @@ def _utc_minutes_to_time(utc_minutes: int, timezone: tzinfo) -> time:
         hour -= 24
     minute = utc_minutes % 60
     try:
-        # pylint: disable-next=home-assistant-enforce-utcnow
-        utc = datetime.now(UTC).replace(
+        utc = dt_util.utcnow().replace(
             hour=hour, minute=minute, second=0, microsecond=0
         )
     except ValueError as exc:

homeassistant/components/timer/trigger.py

@@ -1,5 +1,6 @@
 """Provides triggers for timers."""
 
+from collections.abc import Mapping
 from datetime import datetime, timedelta
 from typing import cast, override
 
@@ -128,13 +129,17 @@ class TimeRemainingTrigger(Trigger):
             schedule_for_state(entity_id, to_state, event.context)
 
         @callback
-        def on_entities_update(added: set[str], removed: set[str]) -> None:
+        def on_entities_update(
+            added: set[str],
+            removed: set[str],
+            entity_states: Mapping[str, State | None],
+        ) -> None:
             """Handle changes to the tracked entity set."""
             for entity_id in removed:
                 if entity_id in scheduled:
                     scheduled.pop(entity_id)()
             for entity_id in added:
-                state = self._hass.states.get(entity_id)
+                state = entity_states[entity_id]
                 schedule_for_state(entity_id, state, state.context if state else None)
 
         unsub = await async_track_target_selector_state_change_event(

homeassistant/components/vilfo/sensor.py

@@ -9,7 +9,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import VilfoConfigEntry
@@ -72,12 +72,20 @@ class VilfoRouterSensor(SensorEntity):
         self.entity_description = description
         self.api = api
         self._attr_device_info = DeviceInfo(
+            # This identifier is a non-standard 3-tuple kept as-is to avoid
+            # migrating existing devices; only the connection is added here.
             identifiers={(DOMAIN, api.host, api.mac_address)},  # type: ignore[arg-type]
             name=ROUTER_DEFAULT_NAME,
             manufacturer=ROUTER_MANUFACTURER,
             model=ROUTER_DEFAULT_MODEL,
             sw_version=api.firmware_version,
         )
+        # The router does not always report a MAC address (e.g. when set up by
+        # host), so only attach the connection when one is available.
+        if api.mac_address:
+            self._attr_device_info["connections"] = {
+                (CONNECTION_NETWORK_MAC, api.mac_address)
+            }
         self._attr_unique_id = f"{api.unique_id}_{description.key}"
 
     @property

homeassistant/components/webdav/__init__.py

@@ -3,7 +3,11 @@
 import logging
 
 from aiowebdav2.client import Client
-from aiowebdav2.exceptions import UnauthorizedError
+from aiowebdav2.exceptions import (
+    ConnectionExceptionError,
+    NoConnectionError,
+    UnauthorizedError,
+)
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME, CONF_VERIFY_SSL
@@ -35,6 +39,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: WebDavConfigEntry) -> bo
             translation_domain=DOMAIN,
             translation_key="invalid_username_password",
         ) from err
+    except (ConnectionExceptionError, NoConnectionError, TimeoutError) as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="cannot_connect",
+        ) from err
 
     # Check if we can connect to the WebDAV server
     # and access the root directory

homeassistant/components/yolink/coordinator.py

@@ -2,7 +2,7 @@
 
 import asyncio
 from dataclasses import dataclass
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta
 import logging
 from typing import Any
 
@@ -16,6 +16,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, HomeAssistantError
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.util import dt as dt_util
 
 from .const import ATTR_DEVICE_STATE, ATTR_LORA_INFO, DOMAIN, YOLINK_OFFLINE_TIME
 
@@ -72,8 +73,7 @@ class YoLinkCoordinator(DataUpdateCoordinator[dict]):
                 device_reporttime = device_state_resp.data.get("reportAt")
                 if device_reporttime is not None:
                     rpt_time_delta = (
-                        # pylint: disable-next=home-assistant-enforce-utcnow
-                        datetime.now(tz=UTC).replace(tzinfo=None)
+                        dt_util.utcnow().replace(tzinfo=None)
                         - datetime.strptime(device_reporttime, "%Y-%m-%dT%H:%M:%S.%fZ")
                     ).total_seconds()
                     self.dev_online = rpt_time_delta < YOLINK_OFFLINE_TIME

homeassistant/components/yoto/coordinator.py

@@ -97,10 +97,6 @@ class YotoDataUpdateCoordinator(DataUpdateCoordinator[dict[str, YotoPlayer]]):
 
     async def _async_update_data(self) -> dict[str, YotoPlayer]:
         """Fetch fresh data from the Yoto cloud."""
-        # _async_setup already populated the client; skip the duplicate first fetch.
-        if self.data is None:
-            return self.client.players
-
         try:
             await self._session.async_ensure_token_valid()
         except OAuth2TokenRequestReauthError as err:

homeassistant/components/yoto/diagnostics.py

@@ -0,0 +1,33 @@
+"""Diagnostics support for the Yoto integration."""
+
+from dataclasses import asdict
+from typing import Any
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.core import HomeAssistant
+
+from .coordinator import YotoConfigEntry
+
+TO_REDACT = {
+    "access_token",
+    "refresh_token",
+    "mac",
+    "network_ssid",
+}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: YotoConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    coordinator = entry.runtime_data
+    return {
+        "entry": async_redact_data(entry.as_dict(), TO_REDACT),
+        "players": async_redact_data(
+            {
+                player_id: asdict(player)
+                for player_id, player in coordinator.data.items()
+            },
+            TO_REDACT,
+        ),
+    }

homeassistant/components/yoto/quality_scale.yaml

@@ -45,7 +45,7 @@ rules:
 
   # Gold
   devices: done
-  diagnostics: todo
+  diagnostics: done
   discovery-update-info:
     status: exempt
     comment: The integration supports local DHCP discovery (via hostname pattern), but does not implement a separate discovery update handling flow.
@@ -76,4 +76,4 @@ rules:
   # Platinum
   async-dependency: done
   inject-websession: done
-  strict-typing: todo
+  strict-typing: done

homeassistant/const.py

@@ -760,11 +760,29 @@ class UnitOfPrecipitationDepth(StrEnum):
     """Derived from cm³/cm²"""
 
 
+class UnitOfDensity(StrEnum):
+    """Density units.
+
+    Ratio of a substance's mass to its volume.
+    """
+
+    GRAMS_PER_CUBIC_METER = "g/m³"
+    MILLIGRAMS_PER_CUBIC_METER = "mg/m³"
+    MICROGRAMS_PER_CUBIC_METER = "μg/m³"
+    MICROGRAMS_PER_CUBIC_FOOT = "μg/ft³"
+
+
 # Concentration units
-CONCENTRATION_GRAMS_PER_CUBIC_METER: Final = "g/m³"
-CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER: Final = "mg/m³"
-CONCENTRATION_MICROGRAMS_PER_CUBIC_METER: Final = "μg/m³"
-CONCENTRATION_MICROGRAMS_PER_CUBIC_FOOT: Final = "μg/ft³"
+CONCENTRATION_GRAMS_PER_CUBIC_METER: Final = UnitOfDensity.GRAMS_PER_CUBIC_METER.value
+CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER: Final = (
+    UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER.value
+)
+CONCENTRATION_MICROGRAMS_PER_CUBIC_METER: Final = (
+    UnitOfDensity.MICROGRAMS_PER_CUBIC_METER.value
+)
+CONCENTRATION_MICROGRAMS_PER_CUBIC_FOOT: Final = (
+    UnitOfDensity.MICROGRAMS_PER_CUBIC_FOOT.value
+)
 _DEPRECATED_CONCENTRATION_PARTS_PER_CUBIC_METER = DeprecatedConstant(
     "p/m³", "p/m³", "2027.7"
 )

homeassistant/generated/config_flows.py

@@ -654,6 +654,7 @@ FLOWS = {
         "ruuvitag_ble",
         "rympro",
         "sabnzbd",
+        "samsung_exlink",
         "samsung_infrared",
         "samsungtv",
         "sanix",

homeassistant/generated/integrations.json

@@ -6170,6 +6170,12 @@
           "iot_class": "local_polling",
           "name": "Samsung Family Hub"
         },
+        "samsung_exlink": {
+          "integration_type": "device",
+          "config_flow": true,
+          "iot_class": "local_polling",
+          "name": "Samsung TV via ExLink"
+        },
         "samsung_infrared": {
           "integration_type": "device",
           "config_flow": true,

homeassistant/helpers/condition.py

@@ -491,7 +491,10 @@ class _HistoryPrimingManager:
     tracking its entities, or the read could miss a change still queued in the
     recorder and compute too generous an anchor. A condition therefore never
     rides a flush that was already running when it arrived (the lobby); it waits
-    that one out and joins the next.
+    that one out and joins the next, and re-attempts if the flush it rode was
+    cancelled before completing. This mirrors `ReloadServiceHelper` minus its
+    target de-duplication, which does not apply because each condition reads its
+    own entities.
     """
 
     def __init__(self, hass: HomeAssistant) -> None:
@@ -499,6 +502,7 @@ class _HistoryPrimingManager:
         self._hass = hass
         self._flush_condition = asyncio.Condition()
         self._flushing = False
+        self._flush_ok = False
         self._query_lock = asyncio.Lock()
 
     async def async_prime[_T](
@@ -520,29 +524,30 @@ class _HistoryPrimingManager:
             if self._flushing:
                 await self._flush_condition.wait()
 
-        do_flush = False
         while True:
             async with self._flush_condition:
                 if not self._flushing:
                     # First past the lobby this generation: we run the flush.
                     self._flushing = True
-                    do_flush = True
                     break
-                # A peer began a fresh flush after we cleared the lobby; it
-                # covers us too, so wait for it and ride it.
+                # A peer began a fresh flush after we cleared the lobby; ride it.
                 await self._flush_condition.wait()
-                break
-
-        if not do_flush:
-            return
+                if self._flush_ok:
+                    return
+                # The flush we waited for was cancelled before completing (its owner
+                # timed out): loop and start or wait for a fresh one rather than read
+                # against a queue that was never flushed.
 
         instance = get_instance(self._hass)
+        flushed = False
         try:
             if (commit_future := instance.async_get_commit_future()) is not None:
                 await commit_future
+            flushed = True
         finally:
             async with self._flush_condition:
                 self._flushing = False
+                self._flush_ok = flushed
                 self._flush_condition.notify_all()
 
 
@@ -670,7 +675,10 @@ class EntityConditionBase(Condition):
         self._on_unload.append(unsub)
 
     async def _async_on_entities_update(
-        self, added: set[str], removed: set[str]
+        self,
+        added: set[str],
+        removed: set[str],
+        _entity_states: Mapping[str, State | None],
     ) -> None:
         """Handle changes to the tracked entity set.
 

homeassistant/helpers/target.py

@@ -2,7 +2,7 @@
 
 import abc
 import asyncio
-from collections.abc import Callable, Coroutine
+from collections.abc import Callable, Coroutine, Mapping
 import dataclasses
 import logging
 from logging import Logger
@@ -21,6 +21,7 @@ from homeassistant.core import (
     Event,
     EventStateChangedData,
     HomeAssistant,
+    State,
     callback,
 )
 from homeassistant.exceptions import HomeAssistantError
@@ -43,10 +44,19 @@ _LOGGER = logging.getLogger(__name__)
 
 @dataclasses.dataclass(slots=True, frozen=True)
 class TargetStateChangedData:
-    """Data for state change events related to targets."""
+    """Data for state change events related to targets.
+
+    `targeted_entity_states` holds the states of all targeted entities as of
+    the state change event. State change events are dispatched one event loop
+    iteration after the state machine is updated, so the live state machine
+    may already contain later changes; this mapping does not. It is only
+    valid during the synchronous callback: it is updated in place as
+    subsequent events are dispatched.
+    """
 
     state_change_event: Event[EventStateChangedData]
     targeted_entity_ids: set[str]
+    targeted_entity_states: Mapping[str, State | None]
 
 
 def _has_match(ids: str | list[str] | None) -> TypeGuard[str | list[str]]:
@@ -360,7 +370,8 @@ class TargetStateChangeTracker(TargetEntityChangeTracker):
         action: Callable[[TargetStateChangedData], Any],
         entity_filter: Callable[[set[str]], set[str]],
         on_entities_update: Callable[
-            [set[str], set[str]], Coroutine[Any, Any, None] | None
+            [set[str], set[str], Mapping[str, State | None]],
+            Coroutine[Any, Any, None] | None,
         ]
         | None = None,
         *,
@@ -371,7 +382,10 @@ class TargetStateChangeTracker(TargetEntityChangeTracker):
         `on_entities_update` may be a plain callback or a coroutine function.
         A coroutine is awaited for the initial entity set (so setup is
         deterministic) and scheduled as a background task for later
-        registry-driven changes.
+        registry-driven changes. It is called with the added and removed
+        entity ids and the states of all currently targeted entities; the
+        states mapping is only valid during the synchronous call, so a
+        coroutine must copy what it needs before awaiting.
         """
         super().__init__(
             hass,
@@ -383,6 +397,7 @@ class TargetStateChangeTracker(TargetEntityChangeTracker):
         self._on_entities_update = on_entities_update
         self._state_change_unsub: CALLBACK_TYPE | None = None
         self._tracked_entities: set[str] = set()
+        self._tracked_entity_states: dict[str, State | None] = {}
         self._update_tasks: set[asyncio.Task[None]] = set()
 
     async def async_setup(self) -> Callable[[], None]:
@@ -418,25 +433,49 @@ class TargetStateChangeTracker(TargetEntityChangeTracker):
         previous_entities = self._tracked_entities
         self._tracked_entities = tracked_entities
 
+        # Carry over the tracked states of still-tracked entities: they are
+        # consistent with the already-dispatched event stream, while the live
+        # state machine may be ahead of it. Only entities new to the view are
+        # read from the live state machine.
+        previous_states = self._tracked_entity_states
+        tracked_entity_states = {
+            entity_id: (
+                previous_states[entity_id]
+                if entity_id in previous_states
+                else self._hass.states.get(entity_id)
+            )
+            for entity_id in tracked_entities
+        }
+        self._tracked_entity_states = tracked_entity_states
+
         result: Coroutine[Any, Any, None] | None = None
         if self._on_entities_update is not None:
             added = tracked_entities - previous_entities
             removed = previous_entities - tracked_entities
             if added or removed:
-                result = self._on_entities_update(added, removed)
+                result = self._on_entities_update(added, removed, tracked_entity_states)
 
         @callback
         def state_change_listener(event: Event[EventStateChangedData]) -> None:
             """Handle state change events."""
-            if event.data["entity_id"] in tracked_entities:
-                self._action(TargetStateChangedData(event, tracked_entities))
+            if (entity_id := event.data["entity_id"]) not in tracked_entities:
+                return
+            tracked_entity_states[entity_id] = event.data["new_state"]
+            self._action(
+                TargetStateChangedData(event, tracked_entities, tracked_entity_states)
+            )
 
         _LOGGER.debug("Tracking state changes for entities: %s", tracked_entities)
-        if self._state_change_unsub:
-            self._state_change_unsub()
+        # Subscribe before unsubscribing the previous listener: if this
+        # tracker is the only subscriber, unsubscribing first tears down the
+        # shared state change tracker, dropping events which have been fired
+        # but not yet dispatched.
+        previous_unsub = self._state_change_unsub
         self._state_change_unsub = async_track_state_change_event(
             self._hass, tracked_entities, state_change_listener
         )
+        if previous_unsub:
+            previous_unsub()
         return result
 
     def _unsubscribe(self) -> None:
@@ -455,7 +494,10 @@ async def async_track_target_selector_state_change_event(
     target_selector_config: ConfigType,
     action: Callable[[TargetStateChangedData], Any],
     entity_filter: Callable[[set[str]], set[str]] = lambda x: x,
-    on_entities_update: Callable[[set[str], set[str]], Coroutine[Any, Any, None] | None]
+    on_entities_update: Callable[
+        [set[str], set[str], Mapping[str, State | None]],
+        Coroutine[Any, Any, None] | None,
+    ]
     | None = None,
     *,
     primary_entities_only: bool = True,
@@ -467,9 +509,11 @@ async def async_track_target_selector_state_change_event(
     expansion (via device, area, and floor) skips entities
     with an `entity_category` (config or diagnostic entities).
 
-    `on_entities_update` may be a coroutine function; it is awaited for the
-    initial entity set and scheduled as a task for later registry-driven
-    changes, so this function must itself be awaited.
+    `on_entities_update` is called with the added and removed entity ids and
+    the states of all currently targeted entities. It may be a coroutine
+    function; it is awaited for the initial entity set and scheduled as a
+    task for later registry-driven changes, so this function must itself be
+    awaited. The states mapping is only valid during the synchronous call.
     """
     target_selection = TargetSelection(target_selector_config)
     if not target_selection.has_any_target:

homeassistant/helpers/trigger.py

@@ -5,7 +5,7 @@ import asyncio
 from collections import defaultdict
 from collections.abc import Callable, Coroutine, Iterable, Mapping
 from dataclasses import dataclass, field
-from datetime import timedelta
+from datetime import datetime, timedelta
 import functools
 import inspect
 import logging
@@ -75,7 +75,7 @@ from .automation import (
     get_relative_description_key,
     move_options_fields_to_top_level,
 )
-from .event import async_track_same_state
+from .event import async_call_later
 from .integration_platform import async_process_integration_platforms
 from .selector import (
     NumericThresholdMode,
@@ -438,7 +438,11 @@ class EntityTriggerBase(Trigger):
         """
         return state.state not in self._excluded_states
 
-    def count_matches(self, entity_ids: set[str]) -> tuple[int, int]:
+    def count_matches(
+        self,
+        entity_ids: Iterable[str],
+        states: Mapping[str, State | None] | None = None,
+    ) -> tuple[int, int]:
         """Return (matches, included) for the entity set.
 
         `matches` is the number of entities that pass `_should_include` AND
@@ -447,11 +451,19 @@ class EntityTriggerBase(Trigger):
         Callers can use the pair to distinguish vacuous truth
         (`included == 0`) from a genuine all-match
         (`matches == included > 0`).
+
+        Entity states are read from `states` when provided, otherwise from
+        the live state machine. Pass the targeted entity states received
+        with a state change event to evaluate the event against the states
+        as they were when the event fired.
         """
         matches = 0
         included = 0
         for entity_id in entity_ids:
-            state = self._hass.states.get(entity_id)
+            if states is not None:
+                state = states[entity_id]
+            else:
+                state = self._hass.states.get(entity_id)
             if state is None or not self._should_include(state):
                 continue
             included += 1
@@ -459,6 +471,60 @@ class EntityTriggerBase(Trigger):
                 matches += 1
         return matches, included
 
+    @callback
+    def _cancel_invalidated_timers(
+        self,
+        behavior: str,
+        pending_timers: dict[str, CALLBACK_TYPE],
+        target_state_change_data: TargetStateChangedData,
+    ) -> None:
+        """Cancel pending duration timers invalidated by a state change.
+
+        Runs on every delivered state change, before the trigger's own
+        validity checks: an event which cannot fire the trigger, e.g. an
+        entity becoming unavailable, may still invalidate a pending timer.
+        The targeted entity states have already been updated with this
+        event, so the first/all check can simply recount.
+        """
+        event = target_state_change_data.state_change_event
+        if behavior == BEHAVIOR_EACH:
+            entity_id = event.data["entity_id"]
+            if entity_id not in pending_timers:
+                return
+            to_state = event.data["new_state"]
+            if (
+                to_state is None
+                or to_state.state in self._excluded_states
+                or not self.is_valid_state(to_state)
+            ):
+                pending_timers.pop(entity_id)()
+            return
+        if behavior not in pending_timers:
+            return
+        if not self._combined_state_still_valid(
+            behavior,
+            target_state_change_data.targeted_entity_ids,
+            target_state_change_data.targeted_entity_states,
+        ):
+            pending_timers.pop(behavior)()
+
+    def _combined_state_still_valid(
+        self,
+        behavior: str,
+        entity_ids: Iterable[str],
+        states: Mapping[str, State | None],
+    ) -> bool:
+        """Check the combined first/all state for a pending duration timer."""
+        matches, included = self.count_matches(entity_ids, states)
+        if behavior == BEHAVIOR_FIRST:
+            return matches >= 1
+        # Require at least one included entity to avoid keeping the timer
+        # alive when every targeted entity has been filtered out since it
+        # started — a vacuous all-match (`included == 0`) would otherwise
+        # let the action fire after `for:` even though no entity still
+        # matches.
+        return included > 0 and matches == included
+
     @override
     async def async_attach_runner(
         self, run_action: TriggerActionRunner
@@ -466,7 +532,32 @@ class EntityTriggerBase(Trigger):
         """Attach the trigger to an action runner."""
 
         behavior: str = self._options.get(ATTR_BEHAVIOR, BEHAVIOR_EACH)
-        unsub_track_same: dict[str, Callable[[], None]] = {}
+        # Pending `for:` duration timers, keyed by entity_id for behavior
+        # each and by the behavior for first/all.
+        pending_timers: dict[str, CALLBACK_TYPE] = {}
+
+        @callback
+        def handle_entities_update(
+            added: set[str],
+            removed: set[str],
+            entity_states: Mapping[str, State | None],
+        ) -> None:
+            """Re-validate pending duration timers on target changes.
+
+            Timers of entities no longer targeted are cancelled, and the
+            combined first/all condition is recounted over the updated
+            target: e.g. a non-matching entity added to the target breaks a
+            pending all-match.
+            """
+            for entity_id in removed:
+                if (cancel := pending_timers.pop(entity_id, None)) is not None:
+                    cancel()
+            if behavior not in pending_timers:
+                return
+            if not self._combined_state_still_valid(
+                behavior, entity_states.keys(), entity_states
+            ):
+                pending_timers.pop(behavior)()
 
         @callback
         def state_change_listener(
@@ -478,35 +569,10 @@ class EntityTriggerBase(Trigger):
             from_state = event.data["old_state"]
             to_state = event.data["new_state"]
 
-            def state_still_valid(
-                _: str, from_state: State | None, to_state: State | None
-            ) -> bool:
-                """Check if the state is still valid during the duration wait.
-
-                Called by async_track_same_state on each state change to
-                determine whether to cancel the timer.
-                For behavior each, checks the individual entity's state.
-                For behavior first/all, checks the combined state.
-                """
-                if behavior == BEHAVIOR_ALL:
-                    matches, included = self.count_matches(
-                        target_state_change_data.targeted_entity_ids
-                    )
-                    # Require at least one included entity to avoid keeping
-                    # the timer alive when every targeted entity has been
-                    # filtered out since it started — a vacuous all-match
-                    # (`included == 0`) would otherwise let the action fire
-                    # after `for:` even though no entity still matches.
-                    return included > 0 and matches == included
-                if behavior == BEHAVIOR_FIRST:
-                    matches, _included = self.count_matches(
-                        target_state_change_data.targeted_entity_ids
-                    )
-                    return matches >= 1
-                # Behavior each: check the individual entity's state
-                if not to_state or to_state.state in self._excluded_states:
-                    return False
-                return self.is_valid_state(to_state)
+            if pending_timers:
+                self._cancel_invalidated_timers(
+                    behavior, pending_timers, target_state_change_data
+                )
 
             if not from_state or not to_state:
                 return
@@ -526,9 +592,15 @@ class EntityTriggerBase(Trigger):
             ):
                 return
 
+            # Count against the targeted entity states as of this event, not
+            # the live state machine: state change events are dispatched one
+            # event loop iteration after the state machine is updated, so the
+            # state machine may already contain later changes to other
+            # targeted entities.
             if behavior == BEHAVIOR_ALL:
                 matches, included = self.count_matches(
-                    target_state_change_data.targeted_entity_ids
+                    target_state_change_data.targeted_entity_ids,
+                    target_state_change_data.targeted_entity_states,
                 )
                 if matches != included:
                     return
@@ -537,7 +609,8 @@ class EntityTriggerBase(Trigger):
                 # were previously 2 matches the transition would not be valid and we
                 # would have returned already.
                 matches, _ = self.count_matches(
-                    target_state_change_data.targeted_entity_ids
+                    target_state_change_data.targeted_entity_ids,
+                    target_state_change_data.targeted_entity_states,
                 )
                 if matches != 1:
                     return
@@ -565,18 +638,19 @@ class EntityTriggerBase(Trigger):
                 return
 
             subscription_key = entity_id if behavior == BEHAVIOR_EACH else behavior
-            if subscription_key in unsub_track_same:
-                unsub_track_same.pop(subscription_key)()
-            unsub_track_same[subscription_key] = async_track_same_state(
-                self._hass,
-                self._duration,
-                call_action,
-                state_still_valid,
-                entity_ids=(
-                    entity_id
-                    if behavior == BEHAVIOR_EACH
-                    else target_state_change_data.targeted_entity_ids
-                ),
+            if (
+                previous_timer := pending_timers.pop(subscription_key, None)
+            ) is not None:
+                previous_timer()
+
+            @callback
+            def fire_after_duration(_now: datetime) -> None:
+                """Fire the action once the state has held for the duration."""
+                del pending_timers[subscription_key]
+                call_action()
+
+            pending_timers[subscription_key] = async_call_later(
+                self._hass, self._duration, fire_after_duration
             )
 
         unsub = await async_track_target_selector_state_change_event(
@@ -584,6 +658,7 @@ class EntityTriggerBase(Trigger):
             self._target,
             state_change_listener,
             self.entity_filter,
+            handle_entities_update if self._duration else None,
             primary_entities_only=self._primary_entities_only,
         )
 
@@ -591,9 +666,9 @@ class EntityTriggerBase(Trigger):
         def async_remove() -> None:
             """Remove state listeners async."""
             unsub()
-            for async_remove in unsub_track_same.values():
-                async_remove()
-            unsub_track_same.clear()
+            for cancel_timer in pending_timers.values():
+                cancel_timer()
+            pending_timers.clear()
 
         return async_remove
 

homeassistant/requirements.py

@@ -31,7 +31,9 @@ DISCOVERY_INTEGRATIONS: dict[str, Iterable[str]] = {
 }
 DEPRECATED_PACKAGES: dict[str, tuple[str, str]] = {
     # old_package_name: (reason, breaks_in_ha_version)
-    "pyserial-asyncio": ("should be replaced by pyserial-asyncio-fast", "2026.7"),
+    "pyserial": ("should be replaced by serialx", "2027.1"),
+    "pyserial-asyncio": ("should be replaced by serialx", "2027.1"),
+    "pyserial-asyncio-fast": ("should be replaced by serialx", "2027.1"),
 }
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/util/unit_conversion.py

@@ -5,9 +5,6 @@ from functools import lru_cache
 from math import floor, log10
 
 from homeassistant.const import (
-    CONCENTRATION_GRAMS_PER_CUBIC_METER,
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_BILLION,
     CONCENTRATION_PARTS_PER_MILLION,
     PERCENTAGE,
@@ -17,6 +14,7 @@ from homeassistant.const import (
     UnitOfBloodGlucoseConcentration,
     UnitOfConductivity,
     UnitOfDataRate,
+    UnitOfDensity,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
@@ -248,18 +246,18 @@ class CarbonMonoxideConcentrationConverter(BaseUnitConverter):
     _UNIT_CONVERSION: dict[str | None, float] = {
         CONCENTRATION_PARTS_PER_BILLION: 1e9,
         CONCENTRATION_PARTS_PER_MILLION: 1e6,
-        CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER: (
+        UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER: (
             _CARBON_MONOXIDE_MOLAR_MASS / _AMBIENT_IDEAL_GAS_MOLAR_VOLUME * 1e3
         ),
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER: (
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: (
             _CARBON_MONOXIDE_MOLAR_MASS / _AMBIENT_IDEAL_GAS_MOLAR_VOLUME * 1e6
         ),
     }
     VALID_UNITS = {
         CONCENTRATION_PARTS_PER_BILLION,
         CONCENTRATION_PARTS_PER_MILLION,
-        CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
     }
 
 
@@ -494,14 +492,14 @@ class MassVolumeConcentrationConverter(BaseUnitConverter):
 
     UNIT_CLASS = "concentration"
     _UNIT_CONVERSION: dict[str | None, float] = {
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER: 1_000_000.0,  # 1000 µg/m³ = 1 mg/m³
-        CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER: 1000.0,  # 1000 mg/m³ = 1 g/m³
-        CONCENTRATION_GRAMS_PER_CUBIC_METER: 1.0,
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 1_000_000.0,  # 1000 µg/m³ = 1 mg/m³
+        UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER: 1000.0,  # 1000 mg/m³ = 1 g/m³
+        UnitOfDensity.GRAMS_PER_CUBIC_METER: 1.0,
     }
     VALID_UNITS = {
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
-        CONCENTRATION_GRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.GRAMS_PER_CUBIC_METER,
     }
 
 
@@ -512,14 +510,14 @@ class NitrogenDioxideConcentrationConverter(BaseUnitConverter):
     _UNIT_CONVERSION: dict[str | None, float] = {
         CONCENTRATION_PARTS_PER_BILLION: 1e9,
         CONCENTRATION_PARTS_PER_MILLION: 1e6,
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER: (
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: (
             _NITROGEN_DIOXIDE_MOLAR_MASS / _AMBIENT_IDEAL_GAS_MOLAR_VOLUME * 1e6
         ),
     }
     VALID_UNITS = {
         CONCENTRATION_PARTS_PER_BILLION,
         CONCENTRATION_PARTS_PER_MILLION,
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
     }
 
 
@@ -529,13 +527,13 @@ class NitrogenMonoxideConcentrationConverter(BaseUnitConverter):
     UNIT_CLASS = "nitrogen_monoxide"
     _UNIT_CONVERSION: dict[str | None, float] = {
         CONCENTRATION_PARTS_PER_BILLION: 1e9,
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER: (
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: (
             _NITROGEN_MONOXIDE_MOLAR_MASS / _AMBIENT_IDEAL_GAS_MOLAR_VOLUME * 1e6
         ),
     }
     VALID_UNITS = {
         CONCENTRATION_PARTS_PER_BILLION,
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
     }
 
 
@@ -546,14 +544,14 @@ class OzoneConcentrationConverter(BaseUnitConverter):
     _UNIT_CONVERSION: dict[str | None, float] = {
         CONCENTRATION_PARTS_PER_BILLION: 1e9,
         CONCENTRATION_PARTS_PER_MILLION: 1e6,
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER: (
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: (
             _OZONE_MOLAR_MASS / _AMBIENT_IDEAL_GAS_MOLAR_VOLUME * 1e6
         ),
     }
     VALID_UNITS = {
         CONCENTRATION_PARTS_PER_BILLION,
         CONCENTRATION_PARTS_PER_MILLION,
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
     }
 
 
@@ -751,13 +749,13 @@ class SulphurDioxideConcentrationConverter(BaseUnitConverter):
     UNIT_CLASS = "sulphur_dioxide"
     _UNIT_CONVERSION: dict[str | None, float] = {
         CONCENTRATION_PARTS_PER_BILLION: 1e9,
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER: (
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: (
             _SULPHUR_DIOXIDE_MOLAR_MASS / _AMBIENT_IDEAL_GAS_MOLAR_VOLUME * 1e6
         ),
     }
     VALID_UNITS = {
         CONCENTRATION_PARTS_PER_BILLION,
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
     }
 
 

mypy.ini

@@ -4717,6 +4717,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.samsung_exlink.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.samsung_infrared.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -6180,6 +6190,16 @@ disallow_untyped_defs = true
 warn_return_any = true
 warn_unreachable = true
 
+[mypy-homeassistant.components.yoto.*]
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_decorators = true
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unreachable = true
+
 [mypy-homeassistant.components.youtube.*]
 check_untyped_defs = true
 disallow_incomplete_defs = true

requirements_all.txt

@@ -766,7 +766,7 @@ colorlog==6.10.1
 colorthief==0.2.1
 
 # homeassistant.components.compit
-compit-inext-api==0.8.0
+compit-inext-api==0.9.1
 
 # homeassistant.components.concord232
 concord232==0.15.1
@@ -1788,7 +1788,7 @@ openwrt-luci-rpc==1.1.17
 openwrt-ubus-rpc==0.0.3
 
 # homeassistant.components.opower
-opower==0.18.4
+opower==0.18.5
 
 # homeassistant.components.oralb
 oralb-ble==1.1.0
@@ -2949,6 +2949,9 @@ ruuvitag-ble==0.4.0
 # homeassistant.components.yamaha
 rxv==0.7.0
 
+# homeassistant.components.samsung_exlink
+samsung-exlink==1.1.0
+
 # homeassistant.components.samsungtv
 samsungctl[websocket]==0.7.1
 

tests/components/airos/snapshots/test_diagnostics.ambr

@@ -639,7 +639,7 @@
       }),
     }),
     'entry_data': dict({
-      'advanced_settings': dict({
+      'additional_settings': dict({
         'ssl': True,
         'verify_ssl': False,
       }),

tests/components/airos/test_config_flow.py

@@ -21,7 +21,7 @@ from homeassistant.components.airos.const import (
     HOSTNAME,
     IP_ADDRESS,
     MAC_ADDRESS,
-    SECTION_ADVANCED_SETTINGS,
+    SECTION_ADDITIONAL_SETTINGS,
 )
 from homeassistant.config_entries import (
     SOURCE_DHCP,
@@ -48,7 +48,7 @@ NEW_PASSWORD = "new_password"
 REAUTH_STEP = "reauth_confirm"
 RECONFIGURE_STEP = "reconfigure"
 
-MOCK_ADVANCED_SETTINGS = {
+MOCK_ADDITIONAL_SETTINGS = {
     CONF_SSL: True,
     CONF_VERIFY_SSL: False,
 }
@@ -57,7 +57,7 @@ MOCK_CONFIG = {
     CONF_HOST: "1.1.1.1",
     CONF_USERNAME: DEFAULT_USERNAME,
     CONF_PASSWORD: "test-password",
-    SECTION_ADVANCED_SETTINGS: MOCK_ADVANCED_SETTINGS,
+    SECTION_ADDITIONAL_SETTINGS: MOCK_ADDITIONAL_SETTINGS,
 }
 MOCK_CONFIG_REAUTH = {
     CONF_HOST: "1.1.1.1",
@@ -410,7 +410,7 @@ async def test_successful_reconfigure(
 
     user_input = {
         CONF_PASSWORD: NEW_PASSWORD,
-        SECTION_ADVANCED_SETTINGS: {
+        SECTION_ADDITIONAL_SETTINGS: {
             CONF_SSL: True,
             CONF_VERIFY_SSL: True,
         },
@@ -426,8 +426,8 @@ async def test_successful_reconfigure(
 
     updated_entry = hass.config_entries.async_get_entry(mock_config_entry.entry_id)
     assert updated_entry.data[CONF_PASSWORD] == NEW_PASSWORD
-    assert updated_entry.data[SECTION_ADVANCED_SETTINGS][CONF_SSL] is True
-    assert updated_entry.data[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL] is True
+    assert updated_entry.data[SECTION_ADDITIONAL_SETTINGS][CONF_SSL] is True
+    assert updated_entry.data[SECTION_ADDITIONAL_SETTINGS][CONF_VERIFY_SSL] is True
 
     assert updated_entry.data[CONF_HOST] == MOCK_CONFIG[CONF_HOST]
     assert updated_entry.data[CONF_USERNAME] == MOCK_CONFIG[CONF_USERNAME]
@@ -468,7 +468,7 @@ async def test_reconfigure_flow_failure(
 
     user_input = {
         CONF_PASSWORD: NEW_PASSWORD,
-        SECTION_ADVANCED_SETTINGS: {
+        SECTION_ADDITIONAL_SETTINGS: {
             CONF_SSL: True,
             CONF_VERIFY_SSL: True,
         },
@@ -525,7 +525,7 @@ async def test_reconfigure_unique_id_mismatch(
 
     user_input = {
         CONF_PASSWORD: NEW_PASSWORD,
-        SECTION_ADVANCED_SETTINGS: {
+        SECTION_ADDITIONAL_SETTINGS: {
             CONF_SSL: True,
             CONF_VERIFY_SSL: True,
         },
@@ -546,8 +546,8 @@ async def test_reconfigure_unique_id_mismatch(
     updated_entry = hass.config_entries.async_get_entry(mock_config_entry.entry_id)
     assert updated_entry.data[CONF_PASSWORD] == MOCK_CONFIG[CONF_PASSWORD]
     assert (
-        updated_entry.data[SECTION_ADVANCED_SETTINGS][CONF_SSL]
-        == MOCK_CONFIG[SECTION_ADVANCED_SETTINGS][CONF_SSL]
+        updated_entry.data[SECTION_ADDITIONAL_SETTINGS][CONF_SSL]
+        == MOCK_CONFIG[SECTION_ADDITIONAL_SETTINGS][CONF_SSL]
     )
 
 
@@ -611,7 +611,7 @@ async def test_discover_flow_one_device_found(
             {
                 CONF_USERNAME: DEFAULT_USERNAME,
                 CONF_PASSWORD: "test-password",
-                SECTION_ADVANCED_SETTINGS: MOCK_ADVANCED_SETTINGS,
+                SECTION_ADDITIONAL_SETTINGS: MOCK_ADDITIONAL_SETTINGS,
             },
         )
 
@@ -687,7 +687,7 @@ async def test_discover_flow_multiple_devices_found(
             {
                 CONF_USERNAME: DEFAULT_USERNAME,
                 CONF_PASSWORD: "test-password",
-                SECTION_ADVANCED_SETTINGS: MOCK_ADVANCED_SETTINGS,
+                SECTION_ADDITIONAL_SETTINGS: MOCK_ADDITIONAL_SETTINGS,
             },
         )
 
@@ -785,7 +785,7 @@ async def test_configure_device_flow_exceptions(
             {
                 CONF_USERNAME: "wrong-user",
                 CONF_PASSWORD: "wrong-password",
-                SECTION_ADVANCED_SETTINGS: MOCK_ADVANCED_SETTINGS,
+                SECTION_ADDITIONAL_SETTINGS: MOCK_ADDITIONAL_SETTINGS,
             },
         )
 
@@ -801,7 +801,7 @@ async def test_configure_device_flow_exceptions(
             {
                 CONF_USERNAME: DEFAULT_USERNAME,
                 CONF_PASSWORD: "some-password",
-                SECTION_ADVANCED_SETTINGS: MOCK_ADVANCED_SETTINGS,
+                SECTION_ADDITIONAL_SETTINGS: MOCK_ADDITIONAL_SETTINGS,
             },
         )
 

tests/components/airos/test_init.py

@@ -14,7 +14,7 @@ from homeassistant.components.airos.const import (
     DEFAULT_SSL,
     DEFAULT_VERIFY_SSL,
     DOMAIN,
-    SECTION_ADVANCED_SETTINGS,
+    SECTION_ADDITIONAL_SETTINGS,
 )
 from homeassistant.components.airos.coordinator import async_fetch_airos_data
 from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
@@ -46,7 +46,7 @@ MOCK_CONFIG_PLAIN = {
     CONF_HOST: "1.1.1.1",
     CONF_USERNAME: "ubnt",
     CONF_PASSWORD: "test-password",
-    SECTION_ADVANCED_SETTINGS: {
+    SECTION_ADDITIONAL_SETTINGS: {
         CONF_SSL: False,
         CONF_VERIFY_SSL: False,
     },
@@ -56,7 +56,7 @@ MOCK_CONFIG_V1_2 = {
     CONF_HOST: "1.1.1.1",
     CONF_USERNAME: "ubnt",
     CONF_PASSWORD: "test-password",
-    SECTION_ADVANCED_SETTINGS: {
+    SECTION_ADDITIONAL_SETTINGS: {
         CONF_SSL: DEFAULT_SSL,
         CONF_VERIFY_SSL: DEFAULT_VERIFY_SSL,
     },
@@ -86,8 +86,8 @@ async def test_setup_entry_with_default_ssl(
         use_ssl=DEFAULT_SSL,
     )
 
-    assert mock_config_entry.data[SECTION_ADVANCED_SETTINGS][CONF_SSL] is True
-    assert mock_config_entry.data[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL] is False
+    assert mock_config_entry.data[SECTION_ADDITIONAL_SETTINGS][CONF_SSL] is True
+    assert mock_config_entry.data[SECTION_ADDITIONAL_SETTINGS][CONF_VERIFY_SSL] is False
 
 
 async def test_setup_entry_without_ssl(
@@ -120,8 +120,8 @@ async def test_setup_entry_without_ssl(
         use_ssl=False,
     )
 
-    assert entry.data[SECTION_ADVANCED_SETTINGS][CONF_SSL] is False
-    assert entry.data[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL] is False
+    assert entry.data[SECTION_ADDITIONAL_SETTINGS][CONF_SSL] is False
+    assert entry.data[SECTION_ADDITIONAL_SETTINGS][CONF_VERIFY_SSL] is False
 
 
 async def test_ssl_migrate_entry(

tests/components/conversation/test_default_agent.py

@@ -255,6 +255,88 @@ async def test_punctuation(hass: HomeAssistant) -> None:
     assert result.response.intent.slots["name"]["text"] == "test light"
 
 
+@pytest.mark.parametrize(
+    "sentence",
+    [
+        # STT may or may not insert the comma based on speech cadence
+        "Turn off upstairs, hallway",
+        "Turn off upstairs hallway",
+    ],
+)
+@pytest.mark.usefixtures("init_components")
+async def test_punctuation_in_alias(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    sentence: str,
+) -> None:
+    """Test that an alias containing punctuation can still be matched.
+
+    The input is matched with punctuation removed, so the alias must be too.
+    """
+    entity_registry.async_get_or_create(
+        "light", "demo", "1234", suggested_object_id="test_light"
+    )
+    entity_registry.async_update_entity(
+        "light.test_light", aliases=["Upstairs, hallway"]
+    )
+    hass.states.async_set(
+        "light.test_light",
+        "on",
+        attributes={ATTR_FRIENDLY_NAME: "Test light"},
+    )
+    expose_entity(hass, "light.test_light", True)
+
+    calls = async_mock_service(hass, "light", "turn_off")
+    result = await conversation.async_converse(hass, sentence, None, Context(), None)
+
+    assert len(calls) == 1
+    assert calls[0].data["entity_id"][0] == "light.test_light"
+    assert result.response.response_type is intent.IntentResponseType.ACTION_DONE
+
+
+@pytest.mark.parametrize(
+    "sentence",
+    [
+        # STT may or may not insert the comma based on speech cadence
+        "Turn on lights in second, floor",
+        "Turn on lights in second floor",
+    ],
+)
+@pytest.mark.usefixtures("init_components")
+async def test_punctuation_in_area_alias(
+    hass: HomeAssistant,
+    area_registry: ar.AreaRegistry,
+    entity_registry: er.EntityRegistry,
+    sentence: str,
+) -> None:
+    """Test that an area alias containing punctuation can still be matched.
+
+    The input is matched with punctuation removed, so the alias must be too.
+    """
+    area = area_registry.async_get_or_create("area_id")
+    area = area_registry.async_update(area.id, aliases={"Second, floor"})
+
+    entity_registry.async_get_or_create(
+        "light", "demo", "1234", suggested_object_id="test_light"
+    )
+    entity_registry.async_update_entity("light.test_light", area_id=area.id)
+    hass.states.async_set(
+        "light.test_light",
+        "off",
+        attributes={ATTR_FRIENDLY_NAME: "Test light"},
+    )
+    expose_entity(hass, "light.test_light", True)
+
+    calls = async_mock_service(hass, "light", "turn_on")
+    result = await conversation.async_converse(hass, sentence, None, Context(), None)
+
+    assert len(calls) == 1
+    assert calls[0].data["entity_id"][0] == "light.test_light"
+    assert result.response.response_type is intent.IntentResponseType.ACTION_DONE
+    assert result.response.intent is not None
+    assert result.response.intent.slots["area"]["value"] == area.id
+
+
 async def test_expose_flag_automatically_set(
     hass: HomeAssistant,
     entity_registry: er.EntityRegistry,

tests/components/cover/test_device_condition.py

@@ -695,6 +695,8 @@ async def test_if_position(
     assert service_calls[6].data["some"] == "is_pos_not_gt_45 - event - test_event1"
 
     for record in caplog.records:
+        if record.name == "asyncio" and record.getMessage().startswith("Executing "):
+            continue
         assert record.levelname in ("DEBUG", "INFO")
 
 
@@ -857,4 +859,6 @@ async def test_if_tilt_position(
     assert service_calls[6].data["some"] == "is_pos_not_gt_45 - event - test_event1"
 
     for record in caplog.records:
+        if record.name == "asyncio" and record.getMessage().startswith("Executing "):
+            continue
         assert record.levelname in ("DEBUG", "INFO")

tests/components/edifier_infrared/snapshots/test_button.ambr

@@ -1,251 +0,0 @@
-# serializer version: 1
-# name: test_entities[button.edifier_r1700bt_bluetooth-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': list([
-      None,
-    ]),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'config_subentry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': None,
-    'entity_id': 'button.edifier_r1700bt_bluetooth',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'object_id_base': 'Bluetooth',
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Bluetooth',
-    'platform': 'edifier_infrared',
-    'previous_unique_id': None,
-    'suggested_object_id': None,
-    'supported_features': 0,
-    'translation_key': 'bluetooth',
-    'unique_id': '01JTEST0000000000000000000_bluetooth',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_entities[button.edifier_r1700bt_bluetooth-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Edifier R1700BT Bluetooth',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.edifier_r1700bt_bluetooth',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_entities[button.edifier_r1700bt_fx_off-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': list([
-      None,
-    ]),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'config_subentry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': None,
-    'entity_id': 'button.edifier_r1700bt_fx_off',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'object_id_base': 'FX off',
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'FX off',
-    'platform': 'edifier_infrared',
-    'previous_unique_id': None,
-    'suggested_object_id': None,
-    'supported_features': 0,
-    'translation_key': 'fx_off',
-    'unique_id': '01JTEST0000000000000000000_fx_off',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_entities[button.edifier_r1700bt_fx_off-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Edifier R1700BT FX off',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.edifier_r1700bt_fx_off',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_entities[button.edifier_r1700bt_fx_on-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': list([
-      None,
-    ]),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'config_subentry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': None,
-    'entity_id': 'button.edifier_r1700bt_fx_on',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'object_id_base': 'FX on',
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'FX on',
-    'platform': 'edifier_infrared',
-    'previous_unique_id': None,
-    'suggested_object_id': None,
-    'supported_features': 0,
-    'translation_key': 'fx_on',
-    'unique_id': '01JTEST0000000000000000000_fx_on',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_entities[button.edifier_r1700bt_fx_on-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Edifier R1700BT FX on',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.edifier_r1700bt_fx_on',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_entities[button.edifier_r1700bt_line_1-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': list([
-      None,
-    ]),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'config_subentry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': None,
-    'entity_id': 'button.edifier_r1700bt_line_1',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'object_id_base': 'Line 1',
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Line 1',
-    'platform': 'edifier_infrared',
-    'previous_unique_id': None,
-    'suggested_object_id': None,
-    'supported_features': 0,
-    'translation_key': 'line_1',
-    'unique_id': '01JTEST0000000000000000000_line_1',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_entities[button.edifier_r1700bt_line_1-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Edifier R1700BT Line 1',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.edifier_r1700bt_line_1',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_entities[button.edifier_r1700bt_line_2-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': list([
-      None,
-    ]),
-    'area_id': None,
-    'capabilities': None,
-    'config_entry_id': <ANY>,
-    'config_subentry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'button',
-    'entity_category': None,
-    'entity_id': 'button.edifier_r1700bt_line_2',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'object_id_base': 'Line 2',
-    'options': dict({
-    }),
-    'original_device_class': None,
-    'original_icon': None,
-    'original_name': 'Line 2',
-    'platform': 'edifier_infrared',
-    'previous_unique_id': None,
-    'suggested_object_id': None,
-    'supported_features': 0,
-    'translation_key': 'line_2',
-    'unique_id': '01JTEST0000000000000000000_line_2',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_entities[button.edifier_r1700bt_line_2-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'friendly_name': 'Edifier R1700BT Line 2',
-    }),
-    'context': <ANY>,
-    'entity_id': 'button.edifier_r1700bt_line_2',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---

tests/components/edifier_infrared/test_button.py

@@ -1,73 +0,0 @@
-"""Tests for the Edifier Infrared button platform."""
-
-from infrared_protocols.codes.edifier.r1700bt import EdifierR1700BTCode
-import pytest
-from syrupy.assertion import SnapshotAssertion
-
-from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
-from homeassistant.const import ATTR_ENTITY_ID, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from tests.common import MockConfigEntry, snapshot_platform
-from tests.components.common import assert_availability_follows_source_entity
-from tests.components.infrared import EMITTER_ENTITY_ID
-from tests.components.infrared.common import MockInfraredEmitterEntity
-
-BLUETOOTH_BUTTON_ENTITY_ID = "button.edifier_r1700bt_bluetooth"
-
-
-@pytest.fixture
-def platforms() -> list[Platform]:
-    """Return platforms to set up."""
-    return [Platform.BUTTON]
-
-
-@pytest.mark.usefixtures("init_integration")
-async def test_entities(
-    hass: HomeAssistant,
-    snapshot: SnapshotAssertion,
-    entity_registry: er.EntityRegistry,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test the button entities are created with correct attributes."""
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
-
-
-@pytest.mark.parametrize(
-    ("entity_id", "expected_code"),
-    [
-        ("button.edifier_r1700bt_bluetooth", EdifierR1700BTCode.BLUETOOTH),
-        ("button.edifier_r1700bt_line_1", EdifierR1700BTCode.LINE_1),
-        ("button.edifier_r1700bt_line_2", EdifierR1700BTCode.LINE_2),
-        ("button.edifier_r1700bt_fx_on", EdifierR1700BTCode.FX_ON),
-        ("button.edifier_r1700bt_fx_off", EdifierR1700BTCode.FX_OFF),
-    ],
-)
-@pytest.mark.usefixtures("init_integration")
-async def test_button_press_sends_correct_code(
-    hass: HomeAssistant,
-    mock_infrared_emitter_entity: MockInfraredEmitterEntity,
-    entity_id: str,
-    expected_code: EdifierR1700BTCode,
-) -> None:
-    """Test each button press sends the correct IR code."""
-    await hass.services.async_call(
-        BUTTON_DOMAIN,
-        SERVICE_PRESS,
-        {ATTR_ENTITY_ID: entity_id},
-        blocking=True,
-    )
-
-    assert len(mock_infrared_emitter_entity.send_command_calls) == 1
-    assert mock_infrared_emitter_entity.send_command_calls[0] == expected_code
-
-
-@pytest.mark.usefixtures("init_integration")
-async def test_button_availability_follows_ir_entity(
-    hass: HomeAssistant,
-) -> None:
-    """Test button becomes unavailable when IR entity is unavailable."""
-    await assert_availability_follows_source_entity(
-        hass, BLUETOOTH_BUTTON_ENTITY_ID, EMITTER_ENTITY_ID
-    )

tests/components/electrasmart/snapshots/test_init.ambr

@@ -0,0 +1,36 @@
+# serializer version: 1
+# name: test_device_registry
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        'a8:03:2a:b1:23:45',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'electrasmart',
+        'a8032ab12345',
+      ),
+    }),
+    'labels': set({
+    }),
+    'manufacturer': 'Electra',
+    'model': 'Electra A/C',
+    'model_id': None,
+    'name': 'Living Room',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---

tests/components/electrasmart/test_init.py

@@ -0,0 +1,72 @@
+"""Tests for the Electra Smart integration setup."""
+
+from unittest.mock import AsyncMock, Mock, patch
+
+from electrasmart.device import OperationMode
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.electrasmart.const import (
+    CONF_IMEI,
+    CONF_PHONE_NUMBER,
+    DOMAIN,
+)
+from homeassistant.const import CONF_TOKEN
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture(name="mock_device")
+def mock_device_fixture() -> Mock:
+    """Return a mocked Electra AC device."""
+    device = Mock(
+        mac="a8032ab12345",
+        model="Electra A/C",
+        manufactor="Electra",
+        features=[],
+        is_disconnected=Mock(return_value=False),
+        is_on=Mock(return_value=False),
+        is_horizontal_swing=Mock(return_value=False),
+        is_vertical_swing=Mock(return_value=False),
+        get_fan_speed=Mock(return_value=OperationMode.FAN_SPEED_AUTO),
+        get_mode=Mock(return_value=OperationMode.MODE_COOL),
+        get_sensor_temperature=Mock(return_value=24),
+        get_temperature=Mock(return_value=22),
+        get_shabat_mode=Mock(return_value=False),
+    )
+    # `name` is a reserved Mock kwarg, so it must be set after construction.
+    device.name = "Living Room"
+    return device
+
+
+async def test_device_registry(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    mock_device: Mock,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the device registry entry, including the network MAC connection."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id="0521234567",
+        data={
+            CONF_TOKEN: "token",
+            CONF_IMEI: "2b950000024051000000000000000000",
+            CONF_PHONE_NUMBER: "0521234567",
+        },
+    )
+    entry.add_to_hass(hass)
+
+    mock_api = Mock(devices=[mock_device], fetch_devices=AsyncMock())
+    with patch(
+        "homeassistant.components.electrasmart.ElectraAPI", return_value=mock_api
+    ):
+        assert await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    device_entry = device_registry.async_get_device(
+        identifiers={(DOMAIN, "a8032ab12345")}
+    )
+    assert device_entry == snapshot

tests/components/lg_infrared/conftest.py

@@ -39,7 +39,6 @@ def mock_config_entry() -> MockConfigEntry:
             CONF_INFRARED_ENTITY_ID: MOCK_INFRARED_EMITTER_ENTITY_ID,
             CONF_INFRARED_RECEIVER_ENTITY_ID: MOCK_INFRARED_RECEIVER_ENTITY_ID,
         },
-        unique_id=f"lg_ir_tv_{MOCK_INFRARED_EMITTER_ENTITY_ID}",
     )
 
 

tests/components/lg_infrared/test_config_flow.py

@@ -22,12 +22,11 @@ from tests.components.infrared import (
 
 
 @pytest.mark.parametrize(
-    ("config", "expected_title", "unique_id_entity_id"),
+    ("config", "expected_title"),
     [
         (
             {CONF_INFRARED_ENTITY_ID: mock_infrared_emitter_entity_id},
             "LG TV via Test IR emitter",
-            mock_infrared_emitter_entity_id,
         ),
         (
             {
@@ -35,12 +34,10 @@ from tests.components.infrared import (
                 CONF_INFRARED_RECEIVER_ENTITY_ID: mock_infrared_receiver_entity_id,
             },
             "LG TV via Test IR emitter",
-            mock_infrared_emitter_entity_id,
         ),
         (
             {CONF_INFRARED_RECEIVER_ENTITY_ID: mock_infrared_receiver_entity_id},
             "LG TV via Test IR receiver",
-            mock_infrared_receiver_entity_id,
         ),
     ],
 )
@@ -51,7 +48,6 @@ async def test_user_flow_success(
     hass: HomeAssistant,
     config: dict[str, str],
     expected_title: str,
-    unique_id_entity_id: str,
 ) -> None:
     """Test successful user config flow."""
     result = await hass.config_entries.flow.async_init(
@@ -69,7 +65,7 @@ async def test_user_flow_success(
     assert result["type"] is FlowResultType.CREATE_ENTRY
     assert result["title"] == expected_title
     assert result["data"] == {CONF_DEVICE_TYPE: LGDeviceType.TV, **config}
-    assert result["result"].unique_id == f"lg_ir_tv_{unique_id_entity_id}"
+    assert result["result"].unique_id is None
 
 
 @pytest.mark.usefixtures("mock_infrared_emitter_entity")
@@ -90,9 +86,33 @@ async def test_user_flow_requires_emitter_or_receiver(
     assert result["errors"] == {"base": "missing_infrared_entity"}
 
 
-@pytest.mark.usefixtures("mock_infrared_emitter_entity")
+@pytest.mark.usefixtures(
+    "mock_infrared_emitter_entity", "mock_infrared_receiver_entity"
+)
+@pytest.mark.parametrize(
+    "user_input",
+    [
+        pytest.param(
+            {CONF_INFRARED_ENTITY_ID: mock_infrared_emitter_entity_id},
+            id="emitter_conflict",
+        ),
+        pytest.param(
+            {CONF_INFRARED_RECEIVER_ENTITY_ID: mock_infrared_receiver_entity_id},
+            id="receiver_conflict",
+        ),
+        pytest.param(
+            {
+                CONF_INFRARED_ENTITY_ID: mock_infrared_emitter_entity_id,
+                CONF_INFRARED_RECEIVER_ENTITY_ID: mock_infrared_receiver_entity_id,
+            },
+            id="both_conflict",
+        ),
+    ],
+)
 async def test_user_flow_already_configured(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    user_input: dict[str, str],
 ) -> None:
     """Test user flow aborts when entry is already configured."""
     mock_config_entry.add_to_hass(hass)
@@ -105,10 +125,7 @@ async def test_user_flow_already_configured(
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
-        user_input={
-            CONF_DEVICE_TYPE: LGDeviceType.TV,
-            CONF_INFRARED_ENTITY_ID: mock_infrared_emitter_entity_id,
-        },
+        user_input={CONF_DEVICE_TYPE: LGDeviceType.TV, **user_input},
     )
 
     assert result["type"] is FlowResultType.ABORT
@@ -155,6 +172,5 @@ async def test_user_flow_title_from_entity_name(
             CONF_INFRARED_ENTITY_ID: mock_infrared_emitter_entity_id,
         },
     )
-
     assert result["type"] is FlowResultType.CREATE_ENTRY
     assert result["title"] == expected_title

tests/components/lg_infrared/test_init.py

@@ -1,9 +1,24 @@
 """Tests for the LG Infrared integration setup."""
 
+from homeassistant.components.lg_infrared.const import (
+    CONF_DEVICE_TYPE,
+    CONF_INFRARED_ENTITY_ID,
+    CONF_INFRARED_RECEIVER_ENTITY_ID,
+    DOMAIN,
+    LGDeviceType,
+)
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 
 from tests.common import MockConfigEntry
+from tests.components.infrared import (
+    EMITTER_ENTITY_ID as MOCK_INFRARED_EMITTER_ENTITY_ID,
+    RECEIVER_ENTITY_ID as MOCK_INFRARED_RECEIVER_ENTITY_ID,
+)
+from tests.components.infrared.common import (
+    MockInfraredEmitterEntity,
+    MockInfraredReceiverEntity,
+)
 
 
 async def test_setup_and_unload_entry(
@@ -17,3 +32,30 @@ async def test_setup_and_unload_entry(
     await hass.async_block_till_done()
 
     assert entry.state is ConfigEntryState.NOT_LOADED
+
+
+async def test_migrate_v1_to_v2(
+    hass: HomeAssistant,
+    mock_infrared_emitter_entity: MockInfraredEmitterEntity,
+    mock_infrared_receiver_entity: MockInfraredReceiverEntity,
+    mock_lg_tv_code_to_command: None,
+) -> None:
+    """Test migration from v1 (legacy unique_id) to v2 (no unique_id)."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        version=1,
+        unique_id=f"lg_ir_tv_{MOCK_INFRARED_EMITTER_ENTITY_ID}",
+        data={
+            CONF_DEVICE_TYPE: LGDeviceType.TV,
+            CONF_INFRARED_ENTITY_ID: MOCK_INFRARED_EMITTER_ENTITY_ID,
+            CONF_INFRARED_RECEIVER_ENTITY_ID: MOCK_INFRARED_RECEIVER_ENTITY_ID,
+        },
+    )
+    entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert entry.state is ConfigEntryState.LOADED
+    assert entry.version == 2
+    assert entry.unique_id is None

tests/components/mcp/conftest.py

@@ -21,6 +21,7 @@ from homeassistant.components.mcp.const import (
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN, CONF_URL
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
+from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry
 
@@ -104,8 +105,7 @@ async def mock_credential(hass: HomeAssistant) -> None:
 @pytest.fixture(name="config_entry_token_expiration")
 def mock_config_entry_token_expiration() -> datetime.datetime:
     """Fixture to mock the token expiration."""
-    # pylint: disable-next=home-assistant-enforce-utcnow
-    return datetime.datetime.now(datetime.UTC) + datetime.timedelta(days=1)
+    return dt_util.utcnow() + datetime.timedelta(days=1)
 
 
 @pytest.fixture(name="config_entry_with_auth")

tests/components/nest/test_media_source.py

@@ -1622,8 +1622,7 @@ async def test_remove_stale_media(
     event_media = media_files[0]
     assert event_media.name.endswith(".mp4")
 
-    # pylint: disable-next=home-assistant-enforce-utcnow
-    event_time1 = datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=8)
+    event_time1 = dt_util.utcnow() - datetime.timedelta(days=8)
     extra_media1 = (
         device_path / f"{int(event_time1.timestamp())}-camera_motion-test.mp4"
     )
@@ -1634,8 +1633,7 @@ async def test_remove_stale_media(
     )
     extra_media2.write_bytes(mp4.getvalue())
     # This event will not be garbage collected because it is too recent
-    # pylint: disable-next=home-assistant-enforce-utcnow
-    event_time3 = datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=3)
+    event_time3 = dt_util.utcnow() - datetime.timedelta(days=3)
     extra_media3 = (
         device_path / f"{int(event_time3.timestamp())}-camera_motion-test.mp4"
     )
@@ -1645,8 +1643,7 @@ async def test_remove_stale_media(
 
     # Advance the clock to invoke the garbage collector. This will remove extra
     # files that are not valid events that are old enough.
-    # pylint: disable-next=home-assistant-enforce-utcnow
-    point_in_time = datetime.datetime.now(datetime.UTC) + datetime.timedelta(days=1)
+    point_in_time = dt_util.utcnow() + datetime.timedelta(days=1)
     with freeze_time(point_in_time):
         async_fire_time_changed(hass, point_in_time)
         await hass.async_block_till_done()

tests/components/renson/snapshots/test_init.ambr

@@ -0,0 +1,36 @@
+# serializer version: 1
+# name: test_device_registry
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        '80:7d:3a:bd:1e:32',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': '8.0',
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'renson',
+        '80:7d:3a:bd:1e:32',
+      ),
+    }),
+    'labels': set({
+    }),
+    'manufacturer': 'Renson',
+    'model': 'Endura Delta',
+    'model_id': None,
+    'name': 'Ventilation',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'sw_version': 'Firmware version 4.9.1',
+    'via_device_id': None,
+  })
+# ---

tests/components/renson/test_init.py

@@ -0,0 +1,64 @@
+"""Tests for the Renson integration setup."""
+
+from unittest.mock import MagicMock, patch
+
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.renson.const import DOMAIN
+from homeassistant.const import CONF_HOST, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+
+from tests.common import MockConfigEntry
+
+
+async def test_device_registry(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test the device registry entry, including the network MAC connection."""
+    all_data = {
+        "ModifiedItems": [
+            {"Name": "MAC", "Value": "80:7d:3a:bd:1e:32"},
+            {"Name": "Device name", "Value": "Endura Delta"},
+            {"Name": "Firmware version", "Value": "Firmware version 4.9.1"},
+            {"Name": "Hardware version", "Value": "8.0"},
+        ]
+    }
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_HOST: "1.1.1.1"},
+    )
+    entry.add_to_hass(hass)
+
+    mock_api = MagicMock()
+    mock_api.connect.return_value = True
+    mock_api.get_all_data.return_value = all_data
+
+    def _get_field_value(data: dict, fieldname: str) -> str:
+        for item in data["ModifiedItems"]:
+            if item["Name"] == fieldname:
+                return item["Value"]
+        return ""
+
+    mock_api.get_field_value.side_effect = _get_field_value
+
+    with (
+        patch(
+            "homeassistant.components.renson.RensonVentilation",
+            return_value=mock_api,
+        ),
+        patch(
+            "homeassistant.components.renson.PLATFORMS",
+            [Platform.SENSOR],
+        ),
+    ):
+        assert await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    device_entry = device_registry.async_get_device(
+        identifiers={(DOMAIN, "80:7d:3a:bd:1e:32")}
+    )
+    assert device_entry == snapshot

tests/components/reolink/test_init.py

@@ -2,7 +2,7 @@
 
 import asyncio
 from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
+from datetime import timedelta
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock, Mock, patch
 
@@ -47,6 +47,7 @@ from homeassistant.helpers import (
 )
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, format_mac
 from homeassistant.setup import async_setup_component
+from homeassistant.util import dt as dt_util
 
 from .conftest import (
     CONF_BC_CONNECT,
@@ -1205,7 +1206,7 @@ async def test_firmware_update_delay(
     call_count: int,
 ) -> None:
     """Test delay of firmware update check."""
-    now = datetime.now(UTC)  # pylint: disable=home-assistant-enforce-utcnow
+    now = dt_util.utcnow()
     check_delay = (
         now
         + timedelta(seconds=seconds)

tests/components/samsung_exlink/__init__.py

@@ -0,0 +1,4 @@
+"""Tests for the Samsung ExLink integration."""
+
+MOCK_DEVICE = "/dev/ttyUSB0"
+MOCK_MODEL = "frame_2022"

tests/components/samsung_exlink/conftest.py

@@ -0,0 +1,106 @@
+"""Test fixtures for the Samsung ExLink integration."""
+
+from unittest.mock import AsyncMock, patch
+
+import pytest
+from samsung_exlink import MODELS, InputSource, PowerState, SamsungTV, TVState
+
+from homeassistant.components.samsung_exlink.const import DOMAIN
+from homeassistant.const import CONF_DEVICE, CONF_MODEL
+from homeassistant.core import HomeAssistant
+
+from . import MOCK_DEVICE, MOCK_MODEL
+
+from tests.common import MockConfigEntry
+
+
+class MockSamsungTV(SamsungTV):
+    """Samsung TV test double built on the real controller object."""
+
+    def __init__(self, state: TVState) -> None:
+        """Initialize the mock TV."""
+        super().__init__(MOCK_DEVICE, model=MODELS[MOCK_MODEL])
+        self._connected = True
+        self._state = state
+        self.connect = AsyncMock(side_effect=self._mock_connect)
+        self.refresh = AsyncMock()
+        self.query_power = AsyncMock(return_value=PowerState.ON)
+        self.disconnect = AsyncMock(side_effect=self._mock_disconnect)
+        self.power_on = AsyncMock()
+        self.power_off = AsyncMock()
+        self.set_volume = AsyncMock()
+        self.set_mute = AsyncMock()
+        self.select_input_source = AsyncMock()
+
+    def mock_state(self, state: TVState | None) -> None:
+        """Push a state update through the TV."""
+        self._connected = state is not None
+        if state is not None:
+            self._state = state
+        self._notify_subscribers()
+
+    async def _mock_connect(self) -> None:
+        """Pretend to open the serial connection."""
+        self._connected = True
+
+    async def _mock_disconnect(self) -> None:
+        """Pretend to close the serial connection."""
+        self._connected = False
+        self._notify_subscribers()
+
+
+def _default_state() -> TVState:
+    """Return a TVState with typical defaults."""
+    return TVState(
+        power=True,
+        input_source=InputSource.HDMI1,
+        volume=20,
+        mute=False,
+    )
+
+
+@pytest.fixture
+def initial_tv_state() -> TVState:
+    """Return the initial TV state for a test."""
+    return _default_state()
+
+
+@pytest.fixture
+def mock_samsung_tv(initial_tv_state: TVState) -> MockSamsungTV:
+    """Create a mock SamsungTV controller."""
+    return MockSamsungTV(initial_tv_state)
+
+
+@pytest.fixture
+def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
+    """Create a mock config entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={CONF_DEVICE: MOCK_DEVICE, CONF_MODEL: MOCK_MODEL},
+        title="Samsung TV",
+        entry_id="01KPBBPM6WCQ8148EFR0TCG1WW",
+    )
+    entry.add_to_hass(hass)
+    return entry
+
+
+@pytest.fixture(autouse=True)
+async def mock_usb_component(hass: HomeAssistant) -> None:
+    """Mock the USB component to prevent setup failures."""
+    hass.config.components.add("usb")
+
+
+@pytest.fixture
+async def init_components(
+    hass: HomeAssistant,
+    mock_usb_component: None,
+    mock_samsung_tv: MockSamsungTV,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Initialize the Samsung ExLink component."""
+    with patch(
+        "homeassistant.components.samsung_exlink.SamsungTV",
+        return_value=mock_samsung_tv,
+    ):
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()

tests/components/samsung_exlink/snapshots/test_media_player.ambr

@@ -0,0 +1,103 @@
+# serializer version: 1
+# name: test_entities_created[media_player.samsung_tv-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': list([
+      None,
+    ]),
+    'area_id': None,
+    'capabilities': dict({
+      'source_list': list([
+        'av1',
+        'av2',
+        'av3',
+        'component1',
+        'component2',
+        'component3',
+        'dvi1',
+        'dvi2',
+        'dvi3',
+        'hdmi1',
+        'hdmi2',
+        'hdmi3',
+        'hdmi4',
+        'pc1',
+        'pc2',
+        'pc3',
+        'rvu',
+        's_video1',
+        's_video2',
+        's_video3',
+        'tv',
+      ]),
+    }),
+    'config_entry_id': <ANY>,
+    'config_subentry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'media_player',
+    'entity_category': None,
+    'entity_id': 'media_player.samsung_tv',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'object_id_base': None,
+    'options': dict({
+    }),
+    'original_device_class': <MediaPlayerDeviceClass.TV: 'tv'>,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'samsung_exlink',
+    'previous_unique_id': None,
+    'suggested_object_id': None,
+    'supported_features': <MediaPlayerEntityFeature: 3468>,
+    'translation_key': 'tv',
+    'unique_id': '01KPBBPM6WCQ8148EFR0TCG1WW',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_entities_created[media_player.samsung_tv-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'device_class': 'tv',
+      'friendly_name': 'Samsung TV',
+      'is_volume_muted': False,
+      'source': 'hdmi1',
+      'source_list': list([
+        'av1',
+        'av2',
+        'av3',
+        'component1',
+        'component2',
+        'component3',
+        'dvi1',
+        'dvi2',
+        'dvi3',
+        'hdmi1',
+        'hdmi2',
+        'hdmi3',
+        'hdmi4',
+        'pc1',
+        'pc2',
+        'pc3',
+        'rvu',
+        's_video1',
+        's_video2',
+        's_video3',
+        'tv',
+      ]),
+      'supported_features': <MediaPlayerEntityFeature: 3468>,
+      'volume_level': 0.2,
+    }),
+    'context': <ANY>,
+    'entity_id': 'media_player.samsung_tv',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'on',
+  })
+# ---

tests/components/samsung_exlink/test_config_flow.py

@@ -0,0 +1,221 @@
+"""Tests for the Samsung ExLink config flow."""
+
+from collections.abc import Generator
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+from samsung_exlink import SamsungTVError
+
+from homeassistant.components.samsung_exlink.const import DOMAIN
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.const import CONF_DEVICE, CONF_MODEL
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from . import MOCK_DEVICE, MOCK_MODEL
+
+from tests.common import MockConfigEntry
+
+
+@pytest.fixture
+def mock_async_setup_entry(mock_samsung_tv: MagicMock) -> Generator[AsyncMock]:
+    """Prevent config-entry creation tests from setting up the integration."""
+
+    with patch(
+        "homeassistant.components.samsung_exlink.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
+async def test_user_form_creates_entry(
+    hass: HomeAssistant,
+    mock_samsung_tv: MagicMock,
+    mock_async_setup_entry: AsyncMock,
+) -> None:
+    """Test successful config flow creates an entry."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    with patch(
+        "homeassistant.components.samsung_exlink.config_flow.SamsungTV",
+        return_value=mock_samsung_tv,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_DEVICE: MOCK_DEVICE, CONF_MODEL: MOCK_MODEL},
+        )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Samsung TV"
+    assert result["data"] == {CONF_DEVICE: MOCK_DEVICE, CONF_MODEL: MOCK_MODEL}
+    mock_async_setup_entry.assert_awaited_once()
+    mock_samsung_tv.connect.assert_awaited_once()
+    mock_samsung_tv.query_power.assert_awaited_once()
+    mock_samsung_tv.disconnect.assert_awaited_once()
+
+
+async def test_user_form_without_model(
+    hass: HomeAssistant,
+    mock_samsung_tv: MagicMock,
+    mock_async_setup_entry: AsyncMock,
+) -> None:
+    """Test the model field is optional."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    with patch(
+        "homeassistant.components.samsung_exlink.config_flow.SamsungTV",
+        return_value=mock_samsung_tv,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_DEVICE: MOCK_DEVICE},
+        )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["data"] == {CONF_DEVICE: MOCK_DEVICE}
+
+
+@pytest.mark.parametrize(
+    "exception",
+    [TimeoutError, SamsungTVError("garbled response")],
+)
+async def test_user_form_no_tv_shows_troubleshooting(
+    hass: HomeAssistant,
+    mock_samsung_tv: MagicMock,
+    mock_async_setup_entry: AsyncMock,
+    exception: Exception,
+) -> None:
+    """Test a working port with no responding TV routes to troubleshooting."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    mock_samsung_tv.query_power.side_effect = exception
+
+    with patch(
+        "homeassistant.components.samsung_exlink.config_flow.SamsungTV",
+        return_value=mock_samsung_tv,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_DEVICE: MOCK_DEVICE, CONF_MODEL: MOCK_MODEL},
+        )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "troubleshoot"
+
+    # Continuing from troubleshooting returns to the user step to retry.
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    mock_samsung_tv.query_power.side_effect = None
+
+    with patch(
+        "homeassistant.components.samsung_exlink.config_flow.SamsungTV",
+        return_value=mock_samsung_tv,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_DEVICE: MOCK_DEVICE, CONF_MODEL: MOCK_MODEL},
+        )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+
+
+async def test_user_form_query_unexpected_error(
+    hass: HomeAssistant,
+    mock_samsung_tv: MagicMock,
+    mock_async_setup_entry: AsyncMock,
+) -> None:
+    """Test an unexpected error while querying the TV shows the unknown error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    mock_samsung_tv.query_power.side_effect = RuntimeError("boom")
+
+    with patch(
+        "homeassistant.components.samsung_exlink.config_flow.SamsungTV",
+        return_value=mock_samsung_tv,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_DEVICE: MOCK_DEVICE, CONF_MODEL: MOCK_MODEL},
+        )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": "unknown"}
+    mock_samsung_tv.disconnect.assert_awaited_once()
+
+
+@pytest.mark.parametrize(
+    ("exception", "error"),
+    [
+        (ValueError("Invalid port"), "cannot_connect"),
+        (OSError("No such device"), "cannot_connect"),
+        (ConnectionRefusedError("Connection refused"), "cannot_connect"),
+        (RuntimeError("boom"), "unknown"),
+    ],
+)
+async def test_user_form_bad_port_shows_error(
+    hass: HomeAssistant,
+    exception: Exception,
+    error: str,
+    mock_samsung_tv: MagicMock,
+    mock_async_setup_entry: AsyncMock,
+) -> None:
+    """Test a bad serial port keeps the user on the form with an error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    mock_samsung_tv.connect.side_effect = exception
+
+    with patch(
+        "homeassistant.components.samsung_exlink.config_flow.SamsungTV",
+        return_value=mock_samsung_tv,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_DEVICE: MOCK_DEVICE, CONF_MODEL: MOCK_MODEL},
+        )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": error}
+
+    mock_samsung_tv.connect.side_effect = None
+
+    with patch(
+        "homeassistant.components.samsung_exlink.config_flow.SamsungTV",
+        return_value=mock_samsung_tv,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_DEVICE: MOCK_DEVICE, CONF_MODEL: MOCK_MODEL},
+        )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+
+
+async def test_user_duplicate_aborts(hass: HomeAssistant) -> None:
+    """Test we abort if the same port is already configured."""
+    entry = MockConfigEntry(
+        domain=DOMAIN, data={CONF_DEVICE: MOCK_DEVICE, CONF_MODEL: MOCK_MODEL}
+    )
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {CONF_DEVICE: MOCK_DEVICE, CONF_MODEL: MOCK_MODEL},
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"

tests/components/samsung_exlink/test_init.py

@@ -0,0 +1,65 @@
+"""Tests for the Samsung ExLink integration init."""
+
+from unittest.mock import AsyncMock, patch
+
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.core import HomeAssistant
+
+from .conftest import MockSamsungTV
+
+from tests.common import MockConfigEntry
+
+
+async def test_setup_connection_error(
+    hass: HomeAssistant,
+    mock_samsung_tv: MockSamsungTV,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test a connection failure results in a retry."""
+    mock_samsung_tv.connect.side_effect = TimeoutError
+
+    with patch(
+        "homeassistant.components.samsung_exlink.SamsungTV",
+        return_value=mock_samsung_tv,
+    ):
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY
+
+
+async def test_unload_entry(
+    hass: HomeAssistant,
+    mock_samsung_tv: MockSamsungTV,
+    init_components: None,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test unloading a config entry disconnects from the TV."""
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+
+    await hass.config_entries.async_unload(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
+    mock_samsung_tv.disconnect.assert_awaited_once()
+
+
+async def test_remove_entry_while_loaded(
+    hass: HomeAssistant,
+    mock_samsung_tv: MockSamsungTV,
+    init_components: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test removing a config entry does not schedule a reload.
+
+    When removing a loaded entry, disconnect() fires the subscriber callback
+    with state=None. The callback must not schedule a reload because the entry
+    is already being removed (state is no longer LOADED).
+    """
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+
+    await hass.config_entries.async_remove(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
+    mock_samsung_tv.disconnect.assert_awaited_once()

tests/components/samsung_exlink/test_media_player.py

@@ -0,0 +1,291 @@
+"""Tests for the Samsung ExLink media player platform."""
+
+from pathlib import Path
+from unittest.mock import call
+
+from freezegun.api import FrozenDateTimeFactory
+import pytest
+from samsung_exlink import CommandRejected, InputSource, TVState
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.media_player import (
+    ATTR_INPUT_SOURCE,
+    ATTR_INPUT_SOURCE_LIST,
+    ATTR_MEDIA_VOLUME_LEVEL,
+    ATTR_MEDIA_VOLUME_MUTED,
+    DOMAIN as MP_DOMAIN,
+    SERVICE_SELECT_SOURCE,
+    MediaPlayerEntityFeature,
+)
+from homeassistant.components.samsung_exlink.media_player import (
+    INPUT_SOURCE_SAMSUNG_TO_HA,
+    SCAN_INTERVAL,
+)
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ATTR_SUPPORTED_FEATURES,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    SERVICE_VOLUME_DOWN,
+    SERVICE_VOLUME_MUTE,
+    SERVICE_VOLUME_SET,
+    SERVICE_VOLUME_UP,
+    STATE_OFF,
+    STATE_ON,
+    STATE_UNAVAILABLE,
+    STATE_UNKNOWN,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import entity_registry as er
+from homeassistant.util.json import load_json
+
+from .conftest import MockSamsungTV, _default_state
+
+from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
+
+ENTITY_ID = "media_player.samsung_tv"
+
+
+@pytest.fixture(autouse=True)
+async def auto_init_components(init_components: None) -> None:
+    """Set up the component."""
+
+
+async def test_entities_created(
+    hass: HomeAssistant,
+    mock_samsung_tv: MockSamsungTV,
+    snapshot: SnapshotAssertion,
+    mock_config_entry: MockConfigEntry,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test the media player entity is created through config entry setup."""
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
+
+
+async def test_polling_updates_state(
+    hass: HomeAssistant,
+    mock_samsung_tv: MockSamsungTV,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test the entity polls the TV on the scan interval and reflects changes."""
+    assert hass.states.get(ENTITY_ID).state == STATE_ON
+
+    off_state = _default_state()
+    off_state.power = False
+    mock_samsung_tv.refresh.side_effect = lambda: mock_samsung_tv.mock_state(off_state)
+
+    freezer.tick(SCAN_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+
+    mock_samsung_tv.refresh.assert_awaited()
+    assert hass.states.get(ENTITY_ID).state == STATE_OFF
+
+
+async def test_state_updates(
+    hass: HomeAssistant, mock_samsung_tv: MockSamsungTV
+) -> None:
+    """Test the entity updates from TV pushes and disconnects."""
+    assert hass.states.get(ENTITY_ID).state == STATE_ON
+
+    state = _default_state()
+    state.power = False
+    mock_samsung_tv.mock_state(state)
+    await hass.async_block_till_done()
+
+    assert hass.states.get(ENTITY_ID).state == STATE_OFF
+
+    mock_samsung_tv.mock_state(None)
+    await hass.async_block_till_done()
+
+    assert hass.states.get(ENTITY_ID).state == STATE_UNAVAILABLE
+
+
+async def test_state_unknown_when_not_queried(
+    hass: HomeAssistant, mock_samsung_tv: MockSamsungTV
+) -> None:
+    """Test attributes are cleared when the TV reports no state."""
+    mock_samsung_tv.mock_state(TVState())
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.state == STATE_UNKNOWN
+    assert state.attributes.get(ATTR_MEDIA_VOLUME_LEVEL) is None
+
+
+async def test_power_controls(
+    hass: HomeAssistant, mock_samsung_tv: MockSamsungTV
+) -> None:
+    """Test power services call the right methods."""
+    await hass.services.async_call(
+        MP_DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: ENTITY_ID}, blocking=True
+    )
+    mock_samsung_tv.power_on.assert_awaited_once()
+
+    await hass.services.async_call(
+        MP_DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}, blocking=True
+    )
+    mock_samsung_tv.power_off.assert_awaited_once()
+
+
+async def test_volume_controls(
+    hass: HomeAssistant, mock_samsung_tv: MockSamsungTV
+) -> None:
+    """Test volume state and controls."""
+    assert hass.states.get(ENTITY_ID).attributes[ATTR_MEDIA_VOLUME_LEVEL] == 0.2
+
+    await hass.services.async_call(
+        MP_DOMAIN,
+        SERVICE_VOLUME_SET,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_MEDIA_VOLUME_LEVEL: 0.5},
+        blocking=True,
+    )
+    assert mock_samsung_tv.set_volume.await_args == call(50)
+
+    # Volume up/down use the media player base class default step.
+    await hass.services.async_call(
+        MP_DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, blocking=True
+    )
+    assert mock_samsung_tv.set_volume.await_args == call(30)
+
+    await hass.services.async_call(
+        MP_DOMAIN, SERVICE_VOLUME_DOWN, {ATTR_ENTITY_ID: ENTITY_ID}, blocking=True
+    )
+    assert mock_samsung_tv.set_volume.await_args == call(10)
+
+
+async def test_mute_controls(
+    hass: HomeAssistant, mock_samsung_tv: MockSamsungTV
+) -> None:
+    """Test mute state and controls."""
+    assert hass.states.get(ENTITY_ID).attributes[ATTR_MEDIA_VOLUME_MUTED] is False
+
+    await hass.services.async_call(
+        MP_DOMAIN,
+        SERVICE_VOLUME_MUTE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_MEDIA_VOLUME_MUTED: True},
+        blocking=True,
+    )
+    assert mock_samsung_tv.set_mute.await_args == call(True)
+
+    await hass.services.async_call(
+        MP_DOMAIN,
+        SERVICE_VOLUME_MUTE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_MEDIA_VOLUME_MUTED: False},
+        blocking=True,
+    )
+    assert mock_samsung_tv.set_mute.await_args == call(False)
+
+
+async def test_volume_features_depend_on_reported_state(
+    hass: HomeAssistant, mock_samsung_tv: MockSamsungTV
+) -> None:
+    """Test volume features drop when the TV does not report volume/mute.
+
+    A powered-off TV does not answer status queries, so volume and mute are
+    unknown; their controls and attributes are withheld until known.
+    """
+    features = hass.states.get(ENTITY_ID).attributes[ATTR_SUPPORTED_FEATURES]
+    assert features & MediaPlayerEntityFeature.VOLUME_SET
+    assert features & MediaPlayerEntityFeature.VOLUME_STEP
+    assert features & MediaPlayerEntityFeature.VOLUME_MUTE
+
+    state = _default_state()
+    state.volume = None
+    state.mute = None
+    mock_samsung_tv.mock_state(state)
+    await hass.async_block_till_done()
+
+    entity_state = hass.states.get(ENTITY_ID)
+    features = entity_state.attributes[ATTR_SUPPORTED_FEATURES]
+    assert not features & MediaPlayerEntityFeature.VOLUME_SET
+    assert not features & MediaPlayerEntityFeature.VOLUME_STEP
+    assert not features & MediaPlayerEntityFeature.VOLUME_MUTE
+    assert features & MediaPlayerEntityFeature.SELECT_SOURCE
+
+    # The volume attributes are dropped along with the controls.
+    assert ATTR_MEDIA_VOLUME_LEVEL not in entity_state.attributes
+    assert ATTR_MEDIA_VOLUME_MUTED not in entity_state.attributes
+
+
+async def test_no_source_or_volume_controls_when_off(
+    hass: HomeAssistant, mock_samsung_tv: MockSamsungTV
+) -> None:
+    """Test source/volume/mute controls are withheld while the TV is off.
+
+    A standby TV only accepts power-on over RS-232, so offering the other
+    controls would only produce failed commands.
+    """
+    off_state = _default_state()
+    off_state.power = False
+    mock_samsung_tv.mock_state(off_state)
+    await hass.async_block_till_done()
+
+    entity_state = hass.states.get(ENTITY_ID)
+    features = entity_state.attributes[ATTR_SUPPORTED_FEATURES]
+    assert features & MediaPlayerEntityFeature.TURN_ON
+    assert features & MediaPlayerEntityFeature.TURN_OFF
+    assert not features & MediaPlayerEntityFeature.SELECT_SOURCE
+    assert not features & MediaPlayerEntityFeature.VOLUME_SET
+    assert not features & MediaPlayerEntityFeature.VOLUME_STEP
+    assert not features & MediaPlayerEntityFeature.VOLUME_MUTE
+
+    # Stale source/volume/mute attributes are cleared while off.
+    assert ATTR_INPUT_SOURCE not in entity_state.attributes
+    assert ATTR_MEDIA_VOLUME_LEVEL not in entity_state.attributes
+    assert ATTR_MEDIA_VOLUME_MUTED not in entity_state.attributes
+
+
+async def test_source_state_and_controls(
+    hass: HomeAssistant, mock_samsung_tv: MockSamsungTV
+) -> None:
+    """Test source state and selection."""
+    entity_state = hass.states.get(ENTITY_ID)
+    assert entity_state.attributes[ATTR_INPUT_SOURCE] == "hdmi1"
+
+    source_list = entity_state.attributes[ATTR_INPUT_SOURCE_LIST]
+    assert "hdmi1" in source_list
+    assert "tv" in source_list
+    assert source_list == sorted(source_list)
+
+    state = _default_state()
+    state.input_source = InputSource.HDMI2
+    mock_samsung_tv.mock_state(state)
+    await hass.async_block_till_done()
+
+    assert hass.states.get(ENTITY_ID).attributes[ATTR_INPUT_SOURCE] == "hdmi2"
+
+    await hass.services.async_call(
+        MP_DOMAIN,
+        SERVICE_SELECT_SOURCE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_INPUT_SOURCE: "hdmi3"},
+        blocking=True,
+    )
+    assert mock_samsung_tv.select_input_source.await_args == call(InputSource.HDMI3)
+
+
+@pytest.mark.parametrize(
+    "exception",
+    [CommandRejected("rejected"), ConnectionError("connection lost"), TimeoutError],
+)
+async def test_command_error_raises(
+    hass: HomeAssistant, mock_samsung_tv: MockSamsungTV, exception: Exception
+) -> None:
+    """Test library errors raised during an action surface as HomeAssistantError."""
+    mock_samsung_tv.power_on.side_effect = exception
+
+    with pytest.raises(HomeAssistantError):
+        await hass.services.async_call(
+            MP_DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: ENTITY_ID}, blocking=True
+        )
+
+
+def test_input_source_translation_keys_cover_all_enum_members() -> None:
+    """Test all input sources have a declared translation key."""
+    assert set(INPUT_SOURCE_SAMSUNG_TO_HA) == set(InputSource)
+
+    strings = load_json(Path("homeassistant/components/samsung_exlink/strings.json"))
+    assert set(INPUT_SOURCE_SAMSUNG_TO_HA.values()) == set(
+        strings["entity"]["media_player"]["tv"]["state_attributes"]["source"]["state"]
+    )

tests/components/simplisafe/test_init.py

@@ -49,6 +49,21 @@ async def test_base_station_migration(
     assert device_registry.async_get_device(identifiers=new_identifiers) is not None
 
 
+async def test_base_station_model_is_string(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    config_entry: MockConfigEntry,
+    patch_simplisafe_api,
+) -> None:
+    """Test that the base station model is stored as a string in the device registry."""
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    device = device_registry.async_get_device(identifiers={(DOMAIN, "12345")})
+    assert device is not None
+    assert isinstance(device.model, str)
+
+
 async def test_coordinator_update_triggers_reauth_on_invalid_credentials(
     hass: HomeAssistant,
     config_entry: MockConfigEntry,

tests/components/vilfo/snapshots/test_init.ambr

@@ -0,0 +1,69 @@
+# serializer version: 1
+# name: test_device_registry[with_mac]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+      tuple(
+        'mac',
+        'ff:00:00:00:00:00',
+      ),
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'vilfo',
+        'testadmin.vilfo.com',
+        'FF-00-00-00-00-00',
+      ),
+    }),
+    'labels': set({
+    }),
+    'manufacturer': 'Vilfo AB',
+    'model': 'Vilfo Router',
+    'model_id': None,
+    'name': 'Vilfo Router',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'sw_version': '1.1.0',
+    'via_device_id': None,
+  })
+# ---
+# name: test_device_registry[without_mac]
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'config_entries_subentries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'vilfo',
+        'testadmin.vilfo.com',
+        None,
+      ),
+    }),
+    'labels': set({
+    }),
+    'manufacturer': 'Vilfo AB',
+    'model': 'Vilfo Router',
+    'model_id': None,
+    'name': 'Vilfo Router',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'sw_version': '1.1.0',
+    'via_device_id': None,
+  })
+# ---

tests/components/vilfo/test_init.py

@@ -0,0 +1,59 @@
+"""Tests for the Vilfo Router integration setup."""
+
+from unittest.mock import patch
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+
+from homeassistant.components.vilfo.const import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.parametrize(
+    ("mac", "identifiers"),
+    [
+        pytest.param(
+            "FF-00-00-00-00-00",
+            {(DOMAIN, "testadmin.vilfo.com", "FF-00-00-00-00-00")},
+            id="with_mac",
+        ),
+        pytest.param(
+            None,
+            {(DOMAIN, "testadmin.vilfo.com", None)},
+            id="without_mac",
+        ),
+    ],
+)
+async def test_device_registry(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    device_registry: dr.DeviceRegistry,
+    snapshot: SnapshotAssertion,
+    mac: str | None,
+    identifiers: set[tuple[str, str | None]],
+) -> None:
+    """Test the device registry entry.
+
+    The network MAC connection is only attached when the router reports a MAC;
+    a router set up by host may not report one.
+    """
+    mock_config_entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.vilfo.VilfoClient", autospec=True
+    ) as mock_client:
+        client = mock_client.return_value
+        client.mac = mac
+        client.get_board_information.return_value = {
+            "version": "1.1.0",
+            "bootTime": "2024-01-01T00:00:00+00:00",
+        }
+        client.get_load.return_value = 30
+        assert await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    device_entry = device_registry.async_get_device(identifiers=identifiers)
+    assert device_entry == snapshot

tests/components/webdav/test_init.py

@@ -2,7 +2,12 @@
 
 from unittest.mock import AsyncMock
 
-from aiowebdav2.exceptions import AccessDeniedError, UnauthorizedError
+from aiowebdav2.exceptions import (
+    AccessDeniedError,
+    ConnectionExceptionError,
+    NoConnectionError,
+    UnauthorizedError,
+)
 import pytest
 
 from homeassistant.components.webdav.const import CONF_BACKUP_PATH, DOMAIN
@@ -28,8 +33,29 @@ from tests.common import MockConfigEntry
             "Access denied to /access_denied",
             ConfigEntryState.SETUP_ERROR,
         ),
+        (
+            ConnectionExceptionError(ConnectionError("Connection refused")),
+            "Connection refused",
+            ConfigEntryState.SETUP_RETRY,
+        ),
+        (
+            NoConnectionError("webdav.demo"),
+            "No connection with webdav.demo",
+            ConfigEntryState.SETUP_RETRY,
+        ),
+        (
+            TimeoutError(),
+            "",
+            ConfigEntryState.SETUP_RETRY,
+        ),
+    ],
+    ids=[
+        "UnauthorizedError",
+        "AccessDeniedError",
+        "ConnectionExceptionError",
+        "NoConnectionError",
+        "TimeoutError",
     ],
-    ids=["UnauthorizedError", "AccessDeniedError"],
 )
 async def test_error_during_setup(
     hass: HomeAssistant,

tests/components/yoto/snapshots/test_diagnostics.ambr

@@ -0,0 +1,176 @@
+# serializer version: 1
+# name: test_entry_diagnostics
+  dict({
+    'entry': dict({
+      'data': dict({
+        'auth_implementation': 'yoto',
+        'token': dict({
+          'access_token': '**REDACTED**',
+          'expires_in': 3600,
+          'refresh_token': '**REDACTED**',
+          'scope': 'offline_access family:view family:devices:view family:devices:control family:devices:manage family:library:view user:content:view user:icons:manage',
+          'token_type': 'Bearer',
+        }),
+      }),
+      'disabled_by': None,
+      'discovery_keys': dict({
+      }),
+      'domain': 'yoto',
+      'minor_version': 1,
+      'options': dict({
+      }),
+      'pref_disable_new_entities': False,
+      'pref_disable_polling': False,
+      'source': 'user',
+      'subentries': list([
+      ]),
+      'title': 'Yoto',
+      'unique_id': 'auth0|user-test',
+      'version': 1,
+    }),
+    'players': dict({
+      'player-test': dict({
+        'device': dict({
+          'description': None,
+          'device_family': 'v3',
+          'device_group': None,
+          'device_id': 'player-test',
+          'device_type': 'v3',
+          'form_factor': None,
+          'generation': 'gen3',
+          'has_user_given_name': False,
+          'name': 'Nursery Yoto',
+          'release_channel': None,
+        }),
+        'devices_refreshed_at': '2026-05-08T12:00:00+00:00',
+        'extended_status': dict({
+          'active_card': None,
+          'ambient_light_sensor_reading': None,
+          'average_download_speed_bytes_second': None,
+          'battery_level_percentage': None,
+          'battery_level_raw': None,
+          'battery_profile': None,
+          'battery_temperature': None,
+          'battery_voltage_mv': None,
+          'card_insertion_state': None,
+          'current_display_brightness': None,
+          'day_mode': None,
+          'free_disk_space_bytes': None,
+          'is_audio_device_connected': None,
+          'is_background_download_active': None,
+          'is_bluetooth_audio_connected': None,
+          'is_charging': None,
+          'network_ssid': None,
+          'nightlight_mode': None,
+          'power_source': None,
+          'system_volume_percentage': None,
+          'temperature_celcius': None,
+          'total_disk_space_bytes': None,
+          'updated_at': None,
+          'uptime': None,
+          'user_volume_percentage': None,
+          'utc_offset_seconds': None,
+          'utc_time': None,
+          'wifi_strength': None,
+        }),
+        'info': dict({
+          'activation_pop_code': None,
+          'config': dict({
+            'alarms': list([
+            ]),
+            'bluetooth_enabled': None,
+            'bt_headphones_enabled': None,
+            'clock_face': None,
+            'day_ambient_colour': None,
+            'day_display_brightness': None,
+            'day_display_brightness_auto': None,
+            'day_max_volume_limit': None,
+            'day_sounds_off': None,
+            'day_time': dict({
+              '__type': "<class 'datetime.time'>",
+              'isoformat': '07:00:00',
+            }),
+            'day_yoto_daily': None,
+            'day_yoto_radio': None,
+            'display_dim_brightness': None,
+            'display_dim_timeout': None,
+            'headphones_volume_limited': None,
+            'hour_format': None,
+            'locale': None,
+            'log_level': None,
+            'night_ambient_colour': None,
+            'night_display_brightness': None,
+            'night_display_brightness_auto': None,
+            'night_max_volume_limit': None,
+            'night_sounds_off': None,
+            'night_time': dict({
+              '__type': "<class 'datetime.time'>",
+              'isoformat': '19:00:00',
+            }),
+            'night_yoto_daily': None,
+            'night_yoto_radio': None,
+            'pause_power_button': None,
+            'pause_volume_down': None,
+            'repeat_all': None,
+            'show_diagnostics': None,
+            'shutdown_timeout': None,
+            'system_volume': None,
+            'timezone': None,
+            'volume_level': None,
+          }),
+          'device_family': None,
+          'device_group': None,
+          'device_type': None,
+          'error_code': None,
+          'firmware_version': 'v2.17.5',
+          'geo_timezone': None,
+          'mac': '**REDACTED**',
+          'name': None,
+          'pop_code': None,
+          'release_channel_id': None,
+        }),
+        'info_refreshed_at': '2026-05-08T12:00:00+00:00',
+        'is_online': True,
+        'last_event': dict({
+          'card_id': 'card-test',
+          'chapter_key': '01',
+          'chapter_title': 'Chapter 1',
+          'event_utc': None,
+          'playback_status': 'playing',
+          'playback_wait': None,
+          'player_id': 'player-test',
+          'position': 120,
+          'repeat_all': None,
+          'request_id': None,
+          'sleep_timer_active': None,
+          'sleep_timer_seconds': None,
+          'source': None,
+          'streaming': None,
+          'track_key': '01-INT',
+          'track_length': 300,
+          'track_title': 'Introduction',
+          'volume': 8,
+          'volume_max': 16,
+        }),
+        'last_event_received_at': '2026-05-08T12:00:00+00:00',
+        'online_refreshed_at': None,
+        'status': dict({
+          'active_card': None,
+          'ambient_light_sensor_reading': None,
+          'battery_level_percentage': 75,
+          'card_insertion_state': 1,
+          'current_display_brightness': None,
+          'day_mode': 1,
+          'free_disk_space_bytes': None,
+          'is_audio_device_connected': False,
+          'is_bluetooth_audio_connected': False,
+          'is_charging': True,
+          'nightlight_mode': None,
+          'system_volume_percentage': None,
+          'updated_at': None,
+          'user_volume_percentage': None,
+        }),
+      }),
+    }),
+  })
+# ---

tests/components/yoto/test_diagnostics.py

@@ -0,0 +1,29 @@
+"""Tests for the diagnostics data provided by the Yoto integration."""
+
+import pytest
+from syrupy.assertion import SnapshotAssertion
+from syrupy.filters import props
+
+from homeassistant.core import HomeAssistant
+
+from . import setup_integration
+
+from tests.common import MockConfigEntry
+from tests.components.diagnostics import get_diagnostics_for_config_entry
+from tests.typing import ClientSessionGenerator
+
+pytestmark = pytest.mark.usefixtures("setup_credentials", "mock_yoto_client")
+
+
+async def test_entry_diagnostics(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    mock_config_entry: MockConfigEntry,
+    snapshot: SnapshotAssertion,
+) -> None:
+    """Test config entry diagnostics."""
+    await setup_integration(hass, mock_config_entry)
+
+    assert await get_diagnostics_for_config_entry(
+        hass, hass_client, mock_config_entry
+    ) == snapshot(exclude=props("entry_id", "created_at", "modified_at", "expires_at"))

tests/helpers/test_condition.py

@@ -1,7 +1,7 @@
 """Test the condition helper."""
 
 import asyncio
-from collections.abc import Mapping
+from collections.abc import Callable, Mapping
 from contextlib import AbstractContextManager, nullcontext as does_not_raise
 from dataclasses import dataclass, field
 from datetime import datetime, timedelta
@@ -5908,6 +5908,19 @@ async def test_history_priming_manager_serializes_queries(
     assert max_running == 1
 
 
+async def _advance_until(predicate: Callable[[], bool]) -> None:
+    """Pump the event loop until predicate holds, failing if it never does.
+
+    Avoids coupling tests to an exact number of internal await hops while still
+    failing cleanly rather than hanging on a regression.
+    """
+    for _ in range(1000):
+        if predicate():
+            return
+        await asyncio.sleep(0)
+    pytest.fail("condition was not reached")
+
+
 async def test_history_priming_manager_does_not_ride_in_flight_flush(
     recorder_mock: Recorder, hass: HomeAssistant
 ) -> None:
@@ -5917,8 +5930,8 @@ async def test_history_priming_manager_does_not_ride_in_flight_flush(
     sees them. A condition that started tracking after an in-flight flush began
     could miss its own just-queued change if it rode that flush, so it waits the
     flush out and a fresh one is performed for it. Without the lobby step this
-    test fails: the late arrivals would ride the first flush (one flush total)
-    instead of sharing a second, fresh one.
+    test fails: the late arrivals would ride the first flush (it would stay at
+    one flush total) instead of sharing a second, fresh one.
     """
     manager = _HistoryPrimingManager(hass)
     instance = get_instance(hass)
@@ -5936,32 +5949,69 @@ async def test_history_priming_manager_does_not_ride_in_flight_flush(
     with patch.object(instance, "async_get_commit_future", _spy_commit_future):
         # C0 claims the flush and is mid-flush (its commit future is pending).
         c0 = asyncio.create_task(manager.async_prime(_job))
-        for _ in range(10):
-            await asyncio.sleep(0)
-            if flush_futures:
-                break
-        assert len(flush_futures) == 1
+        await _advance_until(lambda: len(flush_futures) == 1)
 
         # Two conditions arrive while C0's flush runs; they must not ride it.
         c1 = asyncio.create_task(manager.async_prime(_job))
         c2 = asyncio.create_task(manager.async_prime(_job))
-        for _ in range(5):
-            await asyncio.sleep(0)
-        # Parked in the lobby: no new flush yet, none finished.
-        assert len(flush_futures) == 1
-        assert not c1.done()
-        assert not c2.done()
 
-        # C0's flush completes; C1 now performs a fresh flush and C2 rides it.
+        # C0's flush completes; C1 then performs a fresh flush and C2 rides it.
         flush_futures[0].set_result(None)
         assert await c0 == "done"
-        for _ in range(10):
-            await asyncio.sleep(0)
-        # Exactly one fresh flush is shared by C1 and C2, not one each: this is
-        # the assertion that fails without the lobby (it would stay 1).
-        assert len(flush_futures) == 2
+        await _advance_until(lambda: len(flush_futures) == 2)
+
         flush_futures[1].set_result(None)
         assert await asyncio.gather(c1, c2) == ["done", "done"]
+        # One fresh flush shared by C1 and C2, not one each (and not C0's stale
+        # one): C1 flushed, C2 rode it.
+        assert len(flush_futures) == 2
+
+
+async def test_history_priming_manager_retries_after_cancelled_flush(
+    recorder_mock: Recorder, hass: HomeAssistant
+) -> None:
+    """A rider re-flushes when the flush it rode was cancelled before completing.
+
+    If the condition performing a generation's shared flush is cancelled by its
+    timeout while awaiting the commit, the riders must not read against the
+    unflushed queue — they perform a fresh flush instead. Without that retry this
+    test fails: the rider would proceed on the cancelled flush and never make a
+    second one.
+    """
+    manager = _HistoryPrimingManager(hass)
+    instance = get_instance(hass)
+
+    flush_futures: list[asyncio.Future[None]] = []
+
+    def _spy_commit_future() -> asyncio.Future[None]:
+        fut = hass.loop.create_future()
+        flush_futures.append(fut)
+        return fut
+
+    async def _job(_recorder: Recorder) -> str:
+        return "done"
+
+    with patch.object(instance, "async_get_commit_future", _spy_commit_future):
+        # C0 takes the lobby so c1 and c2 form one generation behind it.
+        c0 = asyncio.create_task(manager.async_prime(_job))
+        await _advance_until(lambda: len(flush_futures) == 1)
+        c1 = asyncio.create_task(manager.async_prime(_job))
+        c2 = asyncio.create_task(manager.async_prime(_job))
+        flush_futures[0].set_result(None)
+        assert await c0 == "done"
+
+        # c1 performs the generation's flush (the second one) and c2 rides it.
+        await _advance_until(lambda: len(flush_futures) == 2)
+
+        # c1 is cancelled mid-flush, as its timeout would do. c2 must then run
+        # its own fresh flush rather than ride c1's cancelled one.
+        c1.cancel()
+        with pytest.raises(asyncio.CancelledError):
+            await c1
+        await _advance_until(lambda: len(flush_futures) == 3)
+
+        flush_futures[2].set_result(None)
+        assert await c2 == "done"
 
 
 async def test_history_priming_manager_cancelled_lobby_waiter(
@@ -5987,14 +6037,11 @@ async def test_history_priming_manager_cancelled_lobby_waiter(
 
     with patch.object(instance, "async_get_commit_future", _spy_commit_future):
         c0 = asyncio.create_task(manager.async_prime(_job))
-        for _ in range(10):
-            await asyncio.sleep(0)
-            if flush_futures:
-                break
-        # A second priming parks in the lobby, then its timeout cancels it.
+        await _advance_until(lambda: len(flush_futures) == 1)
+        # A second priming parks in the lobby (reached in one step, as its lock
+        # acquire is uncontended), then its timeout cancels it.
         waiter = asyncio.create_task(manager.async_prime(_job))
-        for _ in range(3):
-            await asyncio.sleep(0)
+        await asyncio.sleep(0)
         waiter.cancel()
         with pytest.raises(asyncio.CancelledError):
             await waiter
@@ -6003,9 +6050,7 @@ async def test_history_priming_manager_cancelled_lobby_waiter(
         flush_futures[0].set_result(None)
         assert await c0 == "done"
         later = asyncio.create_task(manager.async_prime(_job))
-        for _ in range(10):
-            await asyncio.sleep(0)
-        assert len(flush_futures) == 2
+        await _advance_until(lambda: len(flush_futures) == 2)
         flush_futures[1].set_result(None)
         assert await later == "done"
 

tests/helpers/test_target.py

@@ -1,6 +1,7 @@
 """Test service helpers."""
 
 import asyncio
+from collections.abc import Mapping
 
 import pytest
 
@@ -16,7 +17,7 @@ from homeassistant.const import (
     STATE_ON,
     EntityCategory,
 )
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant, State, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import (
     area_registry as ar,
@@ -805,16 +806,20 @@ async def test_async_track_target_selector_state_change_event_on_entities_update
     hass: HomeAssistant,
 ) -> None:
     """Test on_entities_update callback reports added and removed entities."""
-    entity_updates: list[tuple[set[str], set[str]]] = []
+    entity_updates: list[tuple[set[str], set[str], set[str]]] = []
 
     @callback
     def state_change_callback(event: target.TargetStateChangedData) -> None:
         """Handle state change events."""
 
     @callback
-    def on_entities_update(added: set[str], removed: set[str]) -> None:
+    def on_entities_update(
+        added: set[str],
+        removed: set[str],
+        entity_states: Mapping[str, State | None],
+    ) -> None:
         """Track entity set changes."""
-        entity_updates.append((added, removed))
+        entity_updates.append((added, removed, set(entity_states)))
 
     config_entry = MockConfigEntry(domain="test")
     config_entry.add_to_hass(hass)
@@ -844,9 +849,10 @@ async def test_async_track_target_selector_state_change_event_on_entities_update
         on_entities_update=on_entities_update,
     )
 
-    # Initial setup fires on_entities_update with all entities as "added"
+    # Initial setup fires on_entities_update with all entities as "added".
+    # The states mapping covers the currently targeted entities.
     assert len(entity_updates) == 1
-    assert entity_updates[-1] == ({entity_a.entity_id}, set())
+    assert entity_updates[-1] == ({entity_a.entity_id}, set(), {entity_a.entity_id})
     entity_updates.clear()
 
     # Add label to entity_b → added
@@ -854,7 +860,11 @@ async def test_async_track_target_selector_state_change_event_on_entities_update
     await hass.async_block_till_done()
 
     assert len(entity_updates) == 1
-    assert entity_updates[-1] == ({entity_b.entity_id}, set())
+    assert entity_updates[-1] == (
+        {entity_b.entity_id},
+        set(),
+        {entity_a.entity_id, entity_b.entity_id},
+    )
     entity_updates.clear()
 
     # Remove label from entity_a → removed
@@ -862,7 +872,7 @@ async def test_async_track_target_selector_state_change_event_on_entities_update
     await hass.async_block_till_done()
 
     assert len(entity_updates) == 1
-    assert entity_updates[-1] == (set(), {entity_a.entity_id})
+    assert entity_updates[-1] == (set(), {entity_a.entity_id}, {entity_b.entity_id})
     entity_updates.clear()
 
     # Remove label from entity_b → removed
@@ -870,7 +880,7 @@ async def test_async_track_target_selector_state_change_event_on_entities_update
     await hass.async_block_till_done()
 
     assert len(entity_updates) == 1
-    assert entity_updates[-1] == (set(), {entity_b.entity_id})
+    assert entity_updates[-1] == (set(), {entity_b.entity_id}, set())
     entity_updates.clear()
 
     # Re-add both labels at once — entity_a first, then entity_b
@@ -880,8 +890,12 @@ async def test_async_track_target_selector_state_change_event_on_entities_update
     await hass.async_block_till_done()
 
     assert len(entity_updates) == 2
-    assert entity_updates[0] == ({entity_a.entity_id}, set())
-    assert entity_updates[1] == ({entity_b.entity_id}, set())
+    assert entity_updates[0] == ({entity_a.entity_id}, set(), {entity_a.entity_id})
+    assert entity_updates[1] == (
+        {entity_b.entity_id},
+        set(),
+        {entity_a.entity_id, entity_b.entity_id},
+    )
     entity_updates.clear()
 
     # After unsubscribing, no more callbacks
@@ -903,7 +917,11 @@ async def test_async_track_target_selector_cancels_update_task_on_unsubscribe(
     def state_change_callback(event: target.TargetStateChangedData) -> None:
         """Handle state change events."""
 
-    async def on_entities_update(added: set[str], removed: set[str]) -> None:
+    async def on_entities_update(
+        added: set[str],
+        removed: set[str],
+        entity_states: Mapping[str, State | None],
+    ) -> None:
         nonlocal cancelled
         started.set()
         try:

tests/helpers/test_trigger.py

@@ -4735,15 +4735,11 @@ async def test_entity_trigger_duration_each_cancelled_when_entity_leaves_target(
     freezer: FrozenDateTimeFactory,
     entity_registry: er.EntityRegistry,
 ) -> None:
-    """Test an each duration timer when its entity is untargeted mid-wait.
+    """Test an each duration timer is cancelled when its entity is untargeted.
 
-    A pending `for:` wait should not outlive the entity's membership of the
+    A pending `for:` wait does not outlive the entity's membership of the
     target: when a registry change removes the entity from the target, the
-    timer should be cancelled.
-
-    This test documents existing unwanted behavior: the duration timer
-    keeps running and the trigger fires for an entity which is no longer
-    targeted.
+    timer is cancelled and the trigger does not fire.
     """
     label_registry = lr.async_get(hass)
     label = label_registry.async_create("Test Each Removal")
@@ -4772,13 +4768,66 @@ async def test_entity_trigger_duration_each_cancelled_when_entity_leaves_target(
     entity_registry.async_update_entity(entry.entity_id, labels=set())
     await hass.async_block_till_done()
 
-    # Advance past the original duration. Unwanted: the trigger fires for
-    # the no-longer-targeted entity.
+    # Advance past the original duration — should NOT fire
     freezer.tick(datetime.timedelta(seconds=10))
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
-    assert len(calls) == 1
-    assert calls[0]["entity_id"] == entry.entity_id
+    assert len(calls) == 0
+
+    unsub()
+
+
+async def test_entity_trigger_duration_each_cancelled_on_entity_rename(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test an each duration timer is cancelled when its entity is renamed.
+
+    A rename is delivered as the old entity id leaving the target and the
+    new entity id joining it, so the pending per-entity timer is cancelled
+    rather than transferred to the new id. The entity stays on and targeted
+    under the new id, but never had an off→on transition as the new id, so
+    no timer is armed for it and the trigger does not fire.
+    """
+    label_registry = lr.async_get(hass)
+    label = label_registry.async_create("Test Each Rename")
+    entry = entity_registry.async_get_or_create("test", "test", "labeled")
+    entity_registry.async_update_entity(entry.entity_id, labels={label.label_id})
+    hass.states.async_set(entry.entity_id, STATE_OFF)
+    await hass.async_block_till_done()
+
+    calls: list[dict[str, Any]] = []
+    unsub = await _arm_off_to_on_trigger(
+        hass,
+        [],
+        BEHAVIOR_EACH,
+        calls,
+        duration={"seconds": 5},
+        target={ATTR_LABEL_ID: label.label_id},
+    )
+
+    hass.states.async_set(entry.entity_id, STATE_ON)
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    # Rename the entity mid-wait. It keeps its label, so it stays targeted
+    # under the new id; the state follows the rename like the entity
+    # component does.
+    freezer.tick(datetime.timedelta(seconds=2))
+    async_fire_time_changed(hass)
+    new_entity_id = "test.renamed"
+    entity_registry.async_update_entity(entry.entity_id, new_entity_id=new_entity_id)
+    hass.states.async_remove(entry.entity_id)
+    hass.states.async_set(new_entity_id, STATE_ON)
+    await hass.async_block_till_done()
+
+    # Advance past the original duration — should NOT fire: the timer for
+    # the old id was cancelled, and the new id never transitioned off→on.
+    freezer.tick(datetime.timedelta(seconds=10))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+    assert len(calls) == 0
 
     unsub()
 
@@ -4788,17 +4837,12 @@ async def test_entity_trigger_duration_all_survives_entity_leaving_target(
     freezer: FrozenDateTimeFactory,
     entity_registry: er.EntityRegistry,
 ) -> None:
-    """Test a pending all timer when an entity is removed from the target.
+    """Test a pending all timer ignores an entity removed from the target.
 
-    Once an entity is removed from the target it should no longer gate the
-    all-match: the timer should keep running and fire if the remaining
-    targeted entities stay matching, even if the removed entity changes to
-    a non-matching state.
-
-    This test documents existing unwanted behavior: the duration cancel
-    check still tracks the entity set frozen when the timer was armed, so
-    the removed entity turning off cancels the timer and the trigger does
-    not fire.
+    Once an entity is removed from the target, it no longer gates the
+    all-match: the timer keeps running and fires if the remaining targeted
+    entities stay matching, even if the removed entity changes to a
+    non-matching state.
     """
     label_registry = lr.async_get(hass)
     label = label_registry.async_create("Test All Removal")
@@ -4826,8 +4870,8 @@ async def test_entity_trigger_duration_all_survives_entity_leaving_target(
     await hass.async_block_till_done()
     assert len(calls) == 0
 
-    # B leaves the target mid-wait and turns off: it should no longer gate
-    # the all-match.
+    # B leaves the target mid-wait and turns off: it no longer gates the
+    # all-match, so the timer keeps running.
     freezer.tick(datetime.timedelta(seconds=2))
     async_fire_time_changed(hass)
     entity_registry.async_update_entity(entry_b.entity_id, labels=set())
@@ -4835,14 +4879,177 @@ async def test_entity_trigger_duration_all_survives_entity_leaving_target(
     hass.states.async_set(entry_b.entity_id, STATE_OFF)
     await hass.async_block_till_done()
 
-    # Unwanted: the remaining targeted entity stayed on for the duration,
-    # so the trigger should fire — but the no-longer-targeted entity
-    # cancelled the timer.
+    # The remaining targeted entity stayed on for the duration — fires
     freezer.tick(datetime.timedelta(seconds=4))
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0]["entity_id"] == entry_b.entity_id
+
+    unsub()
+
+
+@pytest.mark.parametrize(
+    ("added_entity_state", "expected_calls"),
+    [
+        pytest.param(STATE_OFF, 0, id="added_entity_breaks_all_match"),
+        pytest.param(STATE_ON, 1, id="added_entity_keeps_all_match"),
+    ],
+)
+async def test_entity_trigger_duration_all_revalidated_when_entity_joins_target(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    entity_registry: er.EntityRegistry,
+    added_entity_state: str,
+    expected_calls: int,
+) -> None:
+    """Test a pending all timer is re-validated when an entity is added.
+
+    An entity added to the target mid-wait participates in the all-match:
+    a non-matching entity cancels the pending timer, while a matching one
+    leaves it running and the trigger fires after the duration.
+    """
+    label_registry = lr.async_get(hass)
+    label = label_registry.async_create("Test All Addition")
+    entry_a = entity_registry.async_get_or_create("test", "test", "labeled_a")
+    entry_b = entity_registry.async_get_or_create("test", "test", "labeled_b")
+    entity_registry.async_update_entity(entry_a.entity_id, labels={label.label_id})
+    entity_registry.async_update_entity(entry_b.entity_id, labels={label.label_id})
+    hass.states.async_set(entry_a.entity_id, STATE_OFF)
+    hass.states.async_set(entry_b.entity_id, STATE_OFF)
+    await hass.async_block_till_done()
+
+    calls: list[dict[str, Any]] = []
+    unsub = await _arm_off_to_on_trigger(
+        hass,
+        [],
+        BEHAVIOR_ALL,
+        calls,
+        duration={"seconds": 5},
+        target={ATTR_LABEL_ID: label.label_id},
+    )
+
+    hass.states.async_set(entry_a.entity_id, STATE_ON)
+    await hass.async_block_till_done()
+    hass.states.async_set(entry_b.entity_id, STATE_ON)
+    await hass.async_block_till_done()
     assert len(calls) == 0
 
+    # A third entity joins the target mid-wait
+    entry_c = entity_registry.async_get_or_create("test", "test", "labeled_c")
+    hass.states.async_set(entry_c.entity_id, added_entity_state)
+    await hass.async_block_till_done()
+    freezer.tick(datetime.timedelta(seconds=2))
+    async_fire_time_changed(hass)
+    entity_registry.async_update_entity(entry_c.entity_id, labels={label.label_id})
+    await hass.async_block_till_done()
+
+    # Advance past the duration
+    freezer.tick(datetime.timedelta(seconds=10))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+    assert len(calls) == expected_calls
+
+    unsub()
+
+
+async def test_entity_trigger_duration_first_cancelled_when_match_leaves_target(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test a pending first timer when the matching entity is untargeted.
+
+    Removing the only matching entity from the target mid-wait leaves the
+    target without a matching entity, so the pending timer is cancelled and
+    the trigger does not fire.
+    """
+    label_registry = lr.async_get(hass)
+    label = label_registry.async_create("Test First Removal")
+    entry_a = entity_registry.async_get_or_create("test", "test", "labeled_a")
+    entry_b = entity_registry.async_get_or_create("test", "test", "labeled_b")
+    entity_registry.async_update_entity(entry_a.entity_id, labels={label.label_id})
+    entity_registry.async_update_entity(entry_b.entity_id, labels={label.label_id})
+    hass.states.async_set(entry_a.entity_id, STATE_OFF)
+    hass.states.async_set(entry_b.entity_id, STATE_OFF)
+    await hass.async_block_till_done()
+
+    calls: list[dict[str, Any]] = []
+    unsub = await _arm_off_to_on_trigger(
+        hass,
+        [],
+        BEHAVIOR_FIRST,
+        calls,
+        duration={"seconds": 5},
+        target={ATTR_LABEL_ID: label.label_id},
+    )
+
+    hass.states.async_set(entry_a.entity_id, STATE_ON)
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    # The only matching entity leaves the target mid-wait
+    freezer.tick(datetime.timedelta(seconds=2))
+    async_fire_time_changed(hass)
+    entity_registry.async_update_entity(entry_a.entity_id, labels=set())
+    await hass.async_block_till_done()
+
+    # Advance past the original duration — should NOT fire
+    freezer.tick(datetime.timedelta(seconds=10))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    unsub()
+
+
+async def test_entity_trigger_duration_first_survives_entity_joining_target(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    entity_registry: er.EntityRegistry,
+) -> None:
+    """Test a pending first timer when an entity is added to the target.
+
+    The added entity does not match, but at least one targeted entity
+    still does, so the timer keeps running and the trigger fires.
+    """
+    label_registry = lr.async_get(hass)
+    label = label_registry.async_create("Test First Addition")
+    entry_a = entity_registry.async_get_or_create("test", "test", "labeled_a")
+    entity_registry.async_update_entity(entry_a.entity_id, labels={label.label_id})
+    hass.states.async_set(entry_a.entity_id, STATE_OFF)
+    await hass.async_block_till_done()
+
+    calls: list[dict[str, Any]] = []
+    unsub = await _arm_off_to_on_trigger(
+        hass,
+        [],
+        BEHAVIOR_FIRST,
+        calls,
+        duration={"seconds": 5},
+        target={ATTR_LABEL_ID: label.label_id},
+    )
+
+    hass.states.async_set(entry_a.entity_id, STATE_ON)
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    # A non-matching entity joins the target mid-wait
+    entry_b = entity_registry.async_get_or_create("test", "test", "labeled_b")
+    hass.states.async_set(entry_b.entity_id, STATE_OFF)
+    await hass.async_block_till_done()
+    freezer.tick(datetime.timedelta(seconds=2))
+    async_fire_time_changed(hass)
+    entity_registry.async_update_entity(entry_b.entity_id, labels={label.label_id})
+    await hass.async_block_till_done()
+
+    # The matching entity stayed on for the duration — fires
+    freezer.tick(datetime.timedelta(seconds=4))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0]["entity_id"] == entry_a.entity_id
+
     unsub()
 
 
@@ -4851,19 +5058,15 @@ async def test_entity_trigger_first_nested_state_revert(
 ) -> None:
     """Test a synchronous bus listener reverting a state change.
 
-    Writing states from a synchronous bus listener during state change
-    dispatch is not supported: the nested state write is dispatched to the
-    target tracker before the event that caused it, inverting per-entity
-    delivery order. Supported state change tracking via
-    async_track_state_change_event or async_track_state_change_filtered is
-    deferred precisely so callbacks cannot run inside the dispatch loop and
-    cause this.
+    A synchronous bus listener turns entity_a off again from within the
+    dispatch of its turn-on event. The event bus queues the nested off-event
+    and dispatches it after the on-event, so the target tracker observes the
+    two events in fire order and its tracked states view stays consistent.
 
-    This test documents the resulting behavior rather than guaranteeing it:
-    both of entity_a's events are evaluated against the live state machine,
-    which already shows the entity off again, so the trigger does not fire
-    for the blip; entity_b turning on later counts as the only match and
-    fires.
+    The trigger fires for entity_a — it was the first entity to match, even
+    though it was immediately reverted — consistent with behavior each and
+    with a same-iteration blip. Because the view is not left stale, entity_b
+    turning on later is correctly recognized as a first match and fires too.
     """
     entity_a = "test.entity_a"
     entity_b = "test.entity_b"
@@ -4881,9 +5084,6 @@ async def test_entity_trigger_first_nested_state_revert(
         ):
             hass.states.async_set(entity_a, STATE_OFF)
 
-    # Registered before the trigger is armed, so it runs before the state
-    # change tracker's bus listener and its nested write is dispatched to
-    # the tracker first.
     unsub_revert = hass.bus.async_listen(EVENT_STATE_CHANGED, revert_entity_a)
 
     calls: list[dict[str, Any]] = []
@@ -4892,17 +5092,19 @@ async def test_entity_trigger_first_nested_state_revert(
     )
 
     # entity_a turns on and is synchronously reverted to off. The trigger
-    # receives (on→off) then (off→on); the on-event counts no matches in
-    # the live state machine and the trigger does not fire.
+    # receives (off→on) then (on→off) in fire order and fires for the
+    # on-event: entity_a was the first matching entity.
     hass.states.async_set(entity_a, STATE_ON)
     await hass.async_block_till_done()
-    assert len(calls) == 0
+    assert len(calls) == 1
+    assert calls[0]["entity_id"] == entity_a
 
-    # entity_a is off, so entity_b is the first matching entity and fires.
+    # entity_a is off again, so entity_b is now the first matching entity
+    # and the trigger fires for it.
     hass.states.async_set(entity_b, STATE_ON)
     await hass.async_block_till_done()
-    assert len(calls) == 1
-    assert calls[0]["entity_id"] == entity_b
+    assert len(calls) == 2
+    assert calls[1]["entity_id"] == entity_b
 
     unsub()
     unsub_revert()

tests/test_requirements.py

@@ -679,12 +679,30 @@ async def test_discovery_requirements_dhcp(hass: HomeAssistant) -> None:
             " 2020.12, please create a bug report at https://github.com/home-assistant/"
             "core/issues?q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+test_component%22",
         ),
+        (
+            "pyserial",
+            False,
+            "Detected that custom integration",
+            "which should be replaced by serialx. This will stop"
+            " working in Home Assistant 2027.1, please create a bug report at "
+            "https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+"
+            "label%3A%22integration%3A+test_component%22",
+        ),
+        (
+            "pyserial>=3.5",
+            True,
+            "Detected that integration",
+            "which should be replaced by serialx. This will stop"
+            " working in Home Assistant 2027.1, please create a bug report at "
+            "https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+"
+            "label%3A%22integration%3A+test_component%22",
+        ),
         (
             "pyserial-asyncio",
             False,
             "Detected that custom integration",
-            "which should be replaced by pyserial-asyncio-fast. This will stop"
-            " working in Home Assistant 2026.7, please create a bug report at "
+            "which should be replaced by serialx. This will stop"
+            " working in Home Assistant 2027.1, please create a bug report at "
             "https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+"
             "label%3A%22integration%3A+test_component%22",
         ),
@@ -692,8 +710,26 @@ async def test_discovery_requirements_dhcp(hass: HomeAssistant) -> None:
             "pyserial-asyncio>=0.6",
             True,
             "Detected that integration",
-            "which should be replaced by pyserial-asyncio-fast. This will stop"
-            " working in Home Assistant 2026.7, please create a bug report at "
+            "which should be replaced by serialx. This will stop"
+            " working in Home Assistant 2027.1, please create a bug report at "
+            "https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+"
+            "label%3A%22integration%3A+test_component%22",
+        ),
+        (
+            "pyserial-asyncio-fast",
+            False,
+            "Detected that custom integration",
+            "which should be replaced by serialx. This will stop"
+            " working in Home Assistant 2027.1, please create a bug report at "
+            "https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+"
+            "label%3A%22integration%3A+test_component%22",
+        ),
+        (
+            "pyserial-asyncio-fast>=0.6",
+            True,
+            "Detected that integration",
+            "which should be replaced by serialx. This will stop"
+            " working in Home Assistant 2027.1, please create a bug report at "
             "https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+"
             "label%3A%22integration%3A+test_component%22",
         ),

tests/util/test_unit_conversion.py

@@ -6,9 +6,6 @@ from itertools import chain
 import pytest
 
 from homeassistant.const import (
-    CONCENTRATION_GRAMS_PER_CUBIC_METER,
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_BILLION,
     CONCENTRATION_PARTS_PER_MILLION,
     PERCENTAGE,
@@ -17,6 +14,7 @@ from homeassistant.const import (
     UnitOfBloodGlucoseConcentration,
     UnitOfConductivity,
     UnitOfDataRate,
+    UnitOfDensity,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
@@ -128,7 +126,7 @@ _GET_UNIT_RATIO: dict[type[BaseUnitConverter], tuple[str | None, str | None, flo
         18.016,
     ),
     CarbonMonoxideConcentrationConverter: (
-        CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
         CONCENTRATION_PARTS_PER_MILLION,
         1.16441,
     ),
@@ -164,22 +162,22 @@ _GET_UNIT_RATIO: dict[type[BaseUnitConverter], tuple[str | None, str | None, flo
     InformationConverter: (UnitOfInformation.BITS, UnitOfInformation.BYTES, 8),
     MassConverter: (UnitOfMass.STONES, UnitOfMass.KILOGRAMS, 0.157473),
     MassVolumeConcentrationConverter: (
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
         1000,
     ),
     NitrogenDioxideConcentrationConverter: (
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         CONCENTRATION_PARTS_PER_BILLION,
         1.912503,
     ),
     NitrogenMonoxideConcentrationConverter: (
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         CONCENTRATION_PARTS_PER_BILLION,
         1.247389,
     ),
     OzoneConcentrationConverter: (
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         CONCENTRATION_PARTS_PER_BILLION,
         1.995417,
     ),
@@ -201,7 +199,7 @@ _GET_UNIT_RATIO: dict[type[BaseUnitConverter], tuple[str | None, str | None, flo
         1.609343,
     ),
     SulphurDioxideConcentrationConverter: (
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         CONCENTRATION_PARTS_PER_BILLION,
         2.6633,
     ),
@@ -336,13 +334,13 @@ _CONVERTED_VALUE: dict[
             1,
             CONCENTRATION_PARTS_PER_BILLION,
             1.16441,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         ),
         (
             1,
             CONCENTRATION_PARTS_PER_BILLION,
             0.00116441,
-            CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
         ),
         # PPM to other units
         (
@@ -355,51 +353,51 @@ _CONVERTED_VALUE: dict[
             1,
             CONCENTRATION_PARTS_PER_MILLION,
             1.16441,
-            CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
         ),
         (
             1,
             CONCENTRATION_PARTS_PER_MILLION,
             1164.41,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         ),
         # MICROGRAMS_PER_CUBIC_METER to other units
         (
             120000,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
             103056.5,
             CONCENTRATION_PARTS_PER_BILLION,
         ),
         (
             120000,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
             103.0565,
             CONCENTRATION_PARTS_PER_MILLION,
         ),
         (
             120000,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
             120,
-            CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
         ),
         # MILLIGRAMS_PER_CUBIC_METER to other units
         (
             120,
-            CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
             103056.5,
             CONCENTRATION_PARTS_PER_BILLION,
         ),
         (
             120,
-            CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
             103.0565,
             CONCENTRATION_PARTS_PER_MILLION,
         ),
         (
             120,
-            CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
             120000,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         ),
     ],
     NitrogenDioxideConcentrationConverter: [
@@ -407,11 +405,11 @@ _CONVERTED_VALUE: dict[
             1,
             CONCENTRATION_PARTS_PER_BILLION,
             1.912503,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         ),
         (
             120,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
             62.744976,
             CONCENTRATION_PARTS_PER_BILLION,
         ),
@@ -419,11 +417,11 @@ _CONVERTED_VALUE: dict[
             1,
             CONCENTRATION_PARTS_PER_MILLION,
             1912.503,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         ),
         (
             120,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
             0.062744976,
             CONCENTRATION_PARTS_PER_MILLION,
         ),
@@ -445,11 +443,11 @@ _CONVERTED_VALUE: dict[
             1,
             CONCENTRATION_PARTS_PER_BILLION,
             1.247389,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         ),
         (
             120,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
             96.200906,
             CONCENTRATION_PARTS_PER_BILLION,
         ),
@@ -803,11 +801,11 @@ _CONVERTED_VALUE: dict[
             1,
             CONCENTRATION_PARTS_PER_BILLION,
             1.995417,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         ),
         (
             120,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
             60.1378,
             CONCENTRATION_PARTS_PER_BILLION,
         ),
@@ -815,11 +813,11 @@ _CONVERTED_VALUE: dict[
             1,
             CONCENTRATION_PARTS_PER_MILLION,
             1995.417,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         ),
         (
             120,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
             0.0601378,
             CONCENTRATION_PARTS_PER_MILLION,
         ),
@@ -1005,11 +1003,11 @@ _CONVERTED_VALUE: dict[
             1,
             CONCENTRATION_PARTS_PER_BILLION,
             2.6633,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         ),
         (
             120,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
             45.056879,
             CONCENTRATION_PARTS_PER_BILLION,
         ),
@@ -1060,23 +1058,23 @@ _CONVERTED_VALUE: dict[
         # 1000 µg/m³ = 1 mg/m³
         (
             1000,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
             1,
-            CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
         ),
         # 2 mg/m³ = 2000 µg/m³
         (
             2,
-            CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
             2000,
-            CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         ),
         # 3 g/m³ = 3000 mg/m³
         (
             3,
-            CONCENTRATION_GRAMS_PER_CUBIC_METER,
+            UnitOfDensity.GRAMS_PER_CUBIC_METER,
             3000,
-            CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
+            UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
         ),
     ],
     VolumeConverter: [