[pull] dev from home-assistant:dev

homeassistant/components/reolink/manifest.json

@@ -20,5 +20,5 @@
   "iot_class": "local_push",
   "loggers": ["reolink_aio"],
   "quality_scale": "platinum",
-  "requirements": ["reolink-aio==0.21.8"]
+  "requirements": ["reolink-aio==0.21.9"]
 }

homeassistant/components/reolink/number.py

@@ -743,6 +743,7 @@ class ReolinkChimeNumberEntityDescription(
     ReolinkSmartAINumberEntityDescription(
         key="crossline_sensitivity",
         smart_type="crossline",
+        cmd_key="527",
         cmd_id=527,
         translation_key="crossline_sensitivity",
         entity_category=EntityCategory.CONFIG,
@@ -761,6 +762,7 @@ class ReolinkChimeNumberEntityDescription(
     ReolinkSmartAINumberEntityDescription(
         key="intrusion_sensitivity",
         smart_type="intrusion",
+        cmd_key="529",
         cmd_id=529,
         translation_key="intrusion_sensitivity",
         entity_category=EntityCategory.CONFIG,
@@ -779,6 +781,7 @@ class ReolinkChimeNumberEntityDescription(
     ReolinkSmartAINumberEntityDescription(
         key="linger_sensitivity",
         smart_type="loitering",
+        cmd_key="531",
         cmd_id=531,
         translation_key="linger_sensitivity",
         entity_category=EntityCategory.CONFIG,
@@ -797,6 +800,7 @@ class ReolinkChimeNumberEntityDescription(
     ReolinkSmartAINumberEntityDescription(
         key="forgotten_item_sensitivity",
         smart_type="legacy",
+        cmd_key="549",
         cmd_id=549,
         translation_key="forgotten_item_sensitivity",
         entity_registry_enabled_default=False,
@@ -813,6 +817,7 @@ class ReolinkChimeNumberEntityDescription(
     ReolinkSmartAINumberEntityDescription(
         key="taken_item_sensitivity",
         smart_type="loss",
+        cmd_key="551",
         cmd_id=551,
         translation_key="taken_item_sensitivity",
         entity_registry_enabled_default=False,
@@ -829,6 +834,7 @@ class ReolinkChimeNumberEntityDescription(
     ReolinkSmartAINumberEntityDescription(
         key="intrusion_delay",
         smart_type="intrusion",
+        cmd_key="529",
         cmd_id=529,
         translation_key="intrusion_delay",
         entity_registry_enabled_default=False,
@@ -847,6 +853,7 @@ class ReolinkChimeNumberEntityDescription(
     ReolinkSmartAINumberEntityDescription(
         key="linger_delay",
         smart_type="loitering",
+        cmd_key="531",
         cmd_id=531,
         translation_key="linger_delay",
         entity_registry_enabled_default=False,
@@ -864,6 +871,7 @@ class ReolinkChimeNumberEntityDescription(
     ReolinkSmartAINumberEntityDescription(
         key="forgotten_item_delay",
         smart_type="legacy",
+        cmd_key="549",
         cmd_id=549,
         translation_key="forgotten_item_delay",
         entity_registry_enabled_default=False,
@@ -882,6 +890,7 @@ class ReolinkChimeNumberEntityDescription(
     ReolinkSmartAINumberEntityDescription(
         key="taken_item_delay",
         smart_type="loss",
+        cmd_key="551",
         cmd_id=551,
         translation_key="taken_item_delay",
         entity_registry_enabled_default=False,

tests/components/google/test_calendar.py

@@ -388,10 +388,7 @@ async def test_update_error(
 
     with patch("homeassistant.util.utcnow", return_value=now):
         async_fire_time_changed(hass, now)
-        await hass.async_block_till_done()
-        # Ensure coordinator update completes
-        await hass.async_block_till_done()
-        await hass.async_block_till_done()
+        await hass.async_block_till_done(wait_background_tasks=True)
 
     # Entity is marked uanvailable due to API failure
     state = hass.states.get(TEST_ENTITY)
@@ -420,10 +417,7 @@ async def test_update_error(
 
     with patch("homeassistant.util.utcnow", return_value=now):
         async_fire_time_changed(hass, now)
-        await hass.async_block_till_done()
-        # Ensure coordinator update completes
-        await hass.async_block_till_done()
-        await hass.async_block_till_done()
+        await hass.async_block_till_done(wait_background_tasks=True)
 
     # State updated with new API response
     state = hass.states.get(TEST_ENTITY)
@@ -671,10 +665,7 @@ async def test_future_event_update_behavior(
     now += datetime.timedelta(minutes=60)
     freezer.move_to(now)
     async_fire_time_changed(hass, now)
-    await hass.async_block_till_done()
-    # Ensure coordinator update completes
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
+    await hass.async_block_till_done(wait_background_tasks=True)
 
     # Event has started
     state = hass.states.get(TEST_ENTITY)
@@ -711,10 +702,7 @@ async def test_future_event_offset_update_behavior(
     now += datetime.timedelta(minutes=45)
     freezer.move_to(now)
     async_fire_time_changed(hass, now)
-    await hass.async_block_till_done()
-    # Ensure coordinator update completes
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()
+    await hass.async_block_till_done(wait_background_tasks=True)
 
     # Event has not started, but the offset was reached
     state = hass.states.get(TEST_ENTITY)

tests/components/reolink/snapshots/test_diagnostics.ambr

@@ -72,6 +72,10 @@
       0,
     ]),
     'cmd list': dict({
+      '115': dict({
+        '0': 1,
+        'null': 2,
+      }),
       '208': dict({
         '0': 1,
         'null': 1,
@@ -84,10 +88,38 @@
         '0': 1,
         'null': 1,
       }),
-      '594': dict({
+      '439': dict({
         '0': 1,
         'null': 1,
       }),
+      '483': dict({
+        '0': 1,
+        'null': 1,
+      }),
+      '527': dict({
+        '0': 1,
+        'null': 1,
+      }),
+      '529': dict({
+        '0': 2,
+        'null': 2,
+      }),
+      '531': dict({
+        '0': 2,
+        'null': 2,
+      }),
+      '549': dict({
+        '0': 2,
+        'null': 2,
+      }),
+      '551': dict({
+        '0': 2,
+        'null': 2,
+      }),
+      '594': dict({
+        '0': 4,
+        'null': 4,
+      }),
       '609': dict({
         '0': 1,
         'null': 1,
@@ -101,12 +133,12 @@
         'null': 2,
       }),
       'GetAiAlarm': dict({
-        '0': 6,
-        'null': 6,
+        '0': 12,
+        'null': 12,
       }),
       'GetAiCfg': dict({
-        '0': 2,
-        'null': 2,
+        '0': 4,
+        'null': 4,
       }),
       'GetAudioAlarm': dict({
         '0': 1,
@@ -125,8 +157,8 @@
         'null': 2,
       }),
       'GetBatteryInfo': dict({
-        '0': 1,
-        'null': 1,
+        '0': 3,
+        'null': 3,
       }),
       'GetBuzzerAlarmV20': dict({
         '0': 1,
@@ -149,20 +181,27 @@
         'null': 2,
       }),
       'GetEnc': dict({
-        '0': 1,
-        'null': 1,
+        '0': 7,
+        'null': 7,
       }),
       'GetFtp': dict({
         '0': 1,
         'null': 2,
       }),
+      'GetHddInfo': dict({
+        'null': 1,
+      }),
+      'GetImage': dict({
+        '0': 5,
+        'null': 5,
+      }),
       'GetIrLights': dict({
         '0': 1,
         'null': 1,
       }),
       'GetIsp': dict({
-        '0': 1,
-        'null': 1,
+        '0': 6,
+        'null': 6,
       }),
       'GetManualRec': dict({
         '0': 1,
@@ -176,10 +215,13 @@
         '0': 1,
         'null': 1,
       }),
-      'GetPirInfo': dict({
-        '0': 1,
+      'GetPerformance': dict({
         'null': 1,
       }),
+      'GetPirInfo': dict({
+        '0': 4,
+        'null': 4,
+      }),
       'GetPowerLed': dict({
         '0': 2,
         'null': 2,
@@ -192,13 +234,17 @@
         '0': 2,
         'null': 2,
       }),
+      'GetPtzTraceSection': dict({
+        '0': 2,
+        'null': 2,
+      }),
       'GetPush': dict({
         '0': 1,
         'null': 2,
       }),
       'GetRec': dict({
-        '0': 1,
-        'null': 2,
+        '0': 2,
+        'null': 4,
       }),
       'GetScene': dict({
         'null': 1,
@@ -207,8 +253,8 @@
         'null': 1,
       }),
       'GetWhiteLed': dict({
-        '0': 3,
-        'null': 3,
+        '0': 7,
+        'null': 7,
       }),
       'GetZoomFocus': dict({
         '0': 2,

tests/components/reolink/test_diagnostics.py

@@ -2,6 +2,7 @@
 
 from unittest.mock import MagicMock
 
+import pytest
 from reolink_aio.api import Chime
 from syrupy.assertion import SnapshotAssertion
 
@@ -12,6 +13,7 @@
 from tests.typing import ClientSessionGenerator
 
 
+@pytest.mark.usefixtures("entity_registry_enabled_by_default", "reolink_host")
 async def test_entry_diagnostics(
     hass: HomeAssistant,
     hass_client: ClientSessionGenerator,