Increase Zigbee command retries (home-assistant#93877)

* Enable retries for requests * Update unit tests * Account for fewer group retries in unit tests
puddly · Jun 1, 2023 · b9ec3a8 · b9ec3a8
1 parent 226647f
commit b9ec3a8
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 46 deletions.
diff --git a/homeassistant/components/zha/core/cluster_handlers/__init__.py b/homeassistant/components/zha/core/cluster_handlers/__init__.py
@@ -45,6 +45,8 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+DEFAULT_REQUEST_RETRIES = 3
+
 
 class AttrReportConfig(TypedDict, total=True):
     """Configuration to report for the attributes."""
@@ -78,6 +80,8 @@ def decorate_command(cluster_handler, command):
 
     @wraps(command)
     async def wrapper(*args, **kwds):
+        kwds.setdefault("tries", DEFAULT_REQUEST_RETRIES)
+
         try:
             result = await command(*args, **kwds)
             cluster_handler.debug(

diff --git a/tests/components/zha/test_alarm_control_panel.py b/tests/components/zha/test_alarm_control_panel.py
@@ -96,6 +96,7 @@ async def test_alarm_control_panel(
         0,
         security.IasAce.AudibleNotification.Default_Sound,
         security.IasAce.AlarmStatus.No_Alarm,
+        tries=3,
     )
 
     # disarm from HA
@@ -134,6 +135,7 @@ async def test_alarm_control_panel(
         0,
         security.IasAce.AudibleNotification.Default_Sound,
         security.IasAce.AlarmStatus.Emergency,
+        tries=3,
     )
 
     # reset the panel
@@ -157,6 +159,7 @@ async def test_alarm_control_panel(
         0,
         security.IasAce.AudibleNotification.Default_Sound,
         security.IasAce.AlarmStatus.No_Alarm,
+        tries=3,
     )
 
     # arm_night from HA
@@ -177,6 +180,7 @@ async def test_alarm_control_panel(
         0,
         security.IasAce.AudibleNotification.Default_Sound,
         security.IasAce.AlarmStatus.No_Alarm,
+        tries=3,
     )
 
     # reset the panel
@@ -274,5 +278,6 @@ async def reset_alarm_panel(hass, cluster, entity_id):
         0,
         security.IasAce.AudibleNotification.Default_Sound,
         security.IasAce.AlarmStatus.No_Alarm,
+        tries=3,
     )
     cluster.client_command.reset_mock()
diff --git a/tests/components/zha/test_device_action.py b/tests/components/zha/test_device_action.py
@@ -328,7 +328,7 @@ async def test_action(hass: HomeAssistant, device_ias, device_inovelli) -> None:
                 5,
                 expect_reply=False,
                 manufacturer=4151,
-                tries=1,
+                tries=3,
                 tsn=None,
             )
             in cluster.request.call_args_list
@@ -345,7 +345,7 @@ async def test_action(hass: HomeAssistant, device_ias, device_inovelli) -> None:
                 5,
                 expect_reply=False,
                 manufacturer=4151,
-                tries=1,
+                tries=3,
                 tsn=None,
             )
             in cluster.request.call_args_list

diff --git a/tests/components/zha/test_discover.py b/tests/components/zha/test_discover.py
@@ -131,7 +131,7 @@ async def test_devices(
                     ),
                     expect_reply=True,
                     manufacturer=None,
-                    tries=1,
+                    tries=3,
                     tsn=None,
                 )
             ]