code · pull · Dec 27, 2025 · Dec 27, 2025 · Dec 27, 2025 · Dec 27, 2025
diff --git a/homeassistant/components/hikvision/config_flow.py b/homeassistant/components/hikvision/config_flow.py
@@ -52,8 +52,10 @@ async def async_step_user(
                     HikCamera, url, port, username, password, ssl
                 )
             except requests.exceptions.RequestException:
-                _LOGGER.exception("Error connecting to Hikvision device")
                 errors["base"] = "cannot_connect"
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
+                errors["base"] = "unknown"
             else:
                 device_id = camera.get_id
                 device_name = camera.get_name
@@ -105,10 +107,10 @@ async def async_step_import(self, import_data: ConfigType) -> ConfigFlowResult:
                 HikCamera, url, port, username, password, ssl
             )
         except requests.exceptions.RequestException:
-            _LOGGER.exception(
-                "Error connecting to Hikvision device during import, aborting"
-            )
             return self.async_abort(reason="cannot_connect")
+        except Exception:
+            _LOGGER.exception("Unexpected exception")
+            return self.async_abort(reason="unknown")
 
         device_id = camera.get_id
         device_name = camera.get_name
@@ -118,10 +120,6 @@ async def async_step_import(self, import_data: ConfigType) -> ConfigFlowResult:
         await self.async_set_unique_id(device_id)
         self._abort_if_unique_id_configured()
 
-        _LOGGER.warning(
-            "Importing Hikvision config from configuration.yaml for %s", host
-        )
-
         return self.async_create_entry(
             title=name or device_name or host,
             data={

diff --git a/homeassistant/components/hikvision/strings.json b/homeassistant/components/hikvision/strings.json
@@ -1,10 +1,12 @@
 {
   "config": {
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "step": {
       "user": {

diff --git a/homeassistant/components/knx/manifest.json b/homeassistant/components/knx/manifest.json
@@ -13,7 +13,7 @@
   "requirements": [
     "xknx==3.13.0",
     "xknxproject==3.8.2",
-    "knx-frontend==2025.12.24.74016"
+    "knx-frontend==2025.12.25.200238"
   ],
   "single_config_entry": true
 }
diff --git a/homeassistant/components/plugwise/manifest.json b/homeassistant/components/plugwise/manifest.json
@@ -8,6 +8,6 @@
   "iot_class": "local_polling",
   "loggers": ["plugwise"],
   "quality_scale": "platinum",
-  "requirements": ["plugwise==1.11.0"],
+  "requirements": ["plugwise==1.11.2"],
   "zeroconf": ["_plugwise._tcp.local."]
 }
diff --git a/homeassistant/components/zwave_js/discovery.py b/homeassistant/components/zwave_js/discovery.py
@@ -374,7 +374,7 @@ class ZWaveDiscoverySchema:
         platform=Platform.COVER,
         hint="shutter_tilt",
         manufacturer_id={0x0460},
-        product_id={0x0082},
+        product_id={0x0082, 0x0083},
         product_type={0x0003},
         primary_value=ZWaveValueDiscoverySchema(
             command_class={CommandClass.SWITCH_MULTILEVEL},
@@ -412,7 +412,7 @@ class ZWaveDiscoverySchema:
         platform=Platform.COVER,
         hint="shutter",
         manufacturer_id={0x0460},
-        product_id={0x0082},
+        product_id={0x0082, 0x0083},
         product_type={0x0003},
         primary_value=ZWaveValueDiscoverySchema(
             command_class={CommandClass.SWITCH_MULTILEVEL},

diff --git a/requirements_all.txt b/requirements_all.txt
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
diff --git a/tests/components/hikvision/conftest.py b/tests/components/hikvision/conftest.py
@@ -13,9 +13,6 @@
     CONF_SSL,
     CONF_USERNAME,
 )
-from homeassistant.core import HomeAssistant
-
-from . import setup_integration
 
 from tests.common import MockConfigEntry
 
@@ -94,12 +91,3 @@ def mock_hik_nvr(mock_hikcamera: MagicMock) -> MagicMock:
     camera.current_event_states = {}
     camera.get_event_triggers.return_value = {"Motion": [1, 2]}
     return mock_hikcamera
-
-
-@pytest.fixture
-async def init_integration(
-    hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_hikcamera: MagicMock
-) -> MockConfigEntry:
-    """Set up the Hikvision integration for testing."""
-    await setup_integration(hass, mock_config_entry)
-    return mock_config_entry
diff --git a/tests/components/hikvision/test_config_flow.py b/tests/components/hikvision/test_config_flow.py
@@ -161,6 +161,52 @@ async def test_form_exception(
     assert result["result"].unique_id == TEST_DEVICE_ID
 
 
+async def test_form_unknown_exception(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_hikcamera: MagicMock,
+) -> None:
+    """Test we handle unknown exception during connection and can recover."""
+    mock_hikcamera.side_effect = Exception("Unexpected error")
+
+    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_HOST: TEST_HOST,
+            CONF_PORT: TEST_PORT,
+            CONF_USERNAME: TEST_USERNAME,
+            CONF_PASSWORD: TEST_PASSWORD,
+            CONF_SSL: False,
+        },
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {"base": "unknown"}
+
+    # Recover from error
+    mock_hikcamera.side_effect = None
+    mock_hikcamera.return_value.get_id = TEST_DEVICE_ID
+    mock_hikcamera.return_value.get_name = TEST_DEVICE_NAME
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {
+            CONF_HOST: TEST_HOST,
+            CONF_PORT: TEST_PORT,
+            CONF_USERNAME: TEST_USERNAME,
+            CONF_PASSWORD: TEST_PASSWORD,
+            CONF_SSL: False,
+        },
+    )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["result"].unique_id == TEST_DEVICE_ID
+
+
 async def test_form_already_configured(
     hass: HomeAssistant,
     mock_setup_entry: AsyncMock,
@@ -297,6 +343,30 @@ async def test_import_flow_no_device_id(
     assert result["reason"] == "cannot_connect"
 
 
+async def test_import_flow_unknown_exception(
+    hass: HomeAssistant,
+    mock_setup_entry: AsyncMock,
+    mock_hikcamera: MagicMock,
+) -> None:
+    """Test YAML import flow aborts on unknown exception."""
+    mock_hikcamera.side_effect = Exception("Unexpected error")
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_IMPORT},
+        data={
+            CONF_HOST: TEST_HOST,
+            CONF_PORT: TEST_PORT,
+            CONF_USERNAME: TEST_USERNAME,
+            CONF_PASSWORD: TEST_PASSWORD,
+            CONF_SSL: False,
+        },
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "unknown"
+
+
 async def test_import_flow_already_configured(
     hass: HomeAssistant,
     mock_setup_entry: AsyncMock,

diff --git a/tests/components/plugwise/fixtures/m_adam_cooling/data.json b/tests/components/plugwise/fixtures/m_adam_cooling/data.json
@@ -60,7 +60,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "f871b8c4d63549319221e294e4f88074",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Badkamer",
     "sensors": {

diff --git a/tests/components/plugwise/fixtures/m_adam_heating/data.json b/tests/components/plugwise/fixtures/m_adam_heating/data.json
@@ -65,7 +65,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "f871b8c4d63549319221e294e4f88074",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Badkamer",
     "sensors": {

diff --git a/tests/components/plugwise/fixtures/m_adam_jip/data.json b/tests/components/plugwise/fixtures/m_adam_jip/data.json
@@ -84,7 +84,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "d58fec52899f4f1c92e4f8fad6d8c48c",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Logeerkamer",
     "sensors": {
@@ -108,7 +108,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "06aecb3d00354375924f50c47af36bd2",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Slaapkamer",
     "sensors": {
@@ -175,7 +175,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "13228dab8ce04617af318a2888b3c548",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Woonkamer",
     "sensors": {
@@ -275,7 +275,7 @@
     "firmware": "2020-11-04T01:00:00+01:00",
     "hardware": "1",
     "location": "d27aede973b54be484f6842d1b2802ad",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Tom Kinderkamer",
     "sensors": {

diff --git a/tests/components/plugwise/fixtures/m_adam_multiple_devices_per_zone/data.json b/tests/components/plugwise/fixtures/m_adam_multiple_devices_per_zone/data.json
@@ -186,7 +186,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "08963fec7c53423ca5680aa4cb502c63",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Thermostatic Radiator Badkamer 1",
     "sensors": {
@@ -327,7 +327,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "12493538af164a409c6a1c79e38afe1c",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Bios Cv Thermostatic Radiator ",
     "sensors": {
@@ -352,7 +352,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "c50f167537524366a5af7aa3942feb1e",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Floor kraan",
     "sensors": {
@@ -460,7 +460,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "82fa13f017d240daa0d0ea1775420f24",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "Thermostatic Radiator Jessie",
     "sensors": {
@@ -528,7 +528,7 @@
     "firmware": "2019-03-27T01:00:00+01:00",
     "hardware": "1",
     "location": "446ac08dd04d4eff8ac57489757b7314",
-    "model": "Tom/Floor",
+    "model": "Tom",
     "model_id": "106-03",
     "name": "CV Kraan Garage",
     "sensors": {

diff --git a/tests/components/plugwise/snapshots/test_diagnostics.ambr b/tests/components/plugwise/snapshots/test_diagnostics.ambr
@@ -215,7 +215,7 @@
       'firmware': '2019-03-27T01:00:00+01:00',
       'hardware': '1',
       'location': '08963fec7c53423ca5680aa4cb502c63',
-      'model': 'Tom/Floor',
+      'model': 'Tom',
       'model_id': '106-03',
       'name': 'Thermostatic Radiator Badkamer 1',
       'sensors': dict({
@@ -366,7 +366,7 @@
       'firmware': '2019-03-27T01:00:00+01:00',
       'hardware': '1',
       'location': '12493538af164a409c6a1c79e38afe1c',
-      'model': 'Tom/Floor',
+      'model': 'Tom',
       'model_id': '106-03',
       'name': 'Bios Cv Thermostatic Radiator ',
       'sensors': dict({
@@ -391,7 +391,7 @@
       'firmware': '2019-03-27T01:00:00+01:00',
       'hardware': '1',
       'location': 'c50f167537524366a5af7aa3942feb1e',
-      'model': 'Tom/Floor',
+      'model': 'Tom',
       'model_id': '106-03',
       'name': 'Floor kraan',
       'sensors': dict({
@@ -509,7 +509,7 @@
       'firmware': '2019-03-27T01:00:00+01:00',
       'hardware': '1',
       'location': '82fa13f017d240daa0d0ea1775420f24',
-      'model': 'Tom/Floor',
+      'model': 'Tom',
       'model_id': '106-03',
       'name': 'Thermostatic Radiator Jessie',
       'sensors': dict({
@@ -577,7 +577,7 @@
       'firmware': '2019-03-27T01:00:00+01:00',
       'hardware': '1',
       'location': '446ac08dd04d4eff8ac57489757b7314',
-      'model': 'Tom/Floor',
+      'model': 'Tom',
       'model_id': '106-03',
       'name': 'CV Kraan Garage',
       'sensors': dict({