Fix AsusWrt invalid data type with tuple type (home-assistant#105247)

JoramQ · Dec 8, 2023 · f8d9c4c · f8d9c4c
1 parent 3a10ea1
commit f8d9c4c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/homeassistant/components/asuswrt/bridge.py b/homeassistant/components/asuswrt/bridge.py
@@ -55,7 +55,9 @@
 
 
 _AsusWrtBridgeT = TypeVar("_AsusWrtBridgeT", bound="AsusWrtBridge")
-_FuncType = Callable[[_AsusWrtBridgeT], Awaitable[list[Any] | dict[str, Any]]]
+_FuncType = Callable[
+    [_AsusWrtBridgeT], Awaitable[list[Any] | tuple[Any] | dict[str, Any]]
+]
 _ReturnFuncType = Callable[[_AsusWrtBridgeT], Coroutine[Any, Any, dict[str, Any]]]
 
 
@@ -81,7 +83,7 @@ async def _wrapper(self: _AsusWrtBridgeT) -> dict[str, Any]:
 
             if isinstance(data, dict):
                 return dict(zip(keys, list(data.values())))
-            if not isinstance(data, list):
+            if not isinstance(data, (list, tuple)):
                 raise UpdateFailed("Received invalid data type")
             return dict(zip(keys, data))
 

diff --git a/tests/components/asuswrt/conftest.py b/tests/components/asuswrt/conftest.py
@@ -14,9 +14,9 @@
 ASUSWRT_HTTP_LIB = f"{ASUSWRT_BASE}.bridge.AsusWrtHttp"
 ASUSWRT_LEGACY_LIB = f"{ASUSWRT_BASE}.bridge.AsusWrtLegacy"
 
-MOCK_BYTES_TOTAL = [60000000000, 50000000000]
+MOCK_BYTES_TOTAL = 60000000000, 50000000000
 MOCK_BYTES_TOTAL_HTTP = dict(enumerate(MOCK_BYTES_TOTAL))
-MOCK_CURRENT_TRANSFER_RATES = [20000000, 10000000]
+MOCK_CURRENT_TRANSFER_RATES = 20000000, 10000000
 MOCK_CURRENT_TRANSFER_RATES_HTTP = dict(enumerate(MOCK_CURRENT_TRANSFER_RATES))
 MOCK_LOAD_AVG_HTTP = {"load_avg_1": 1.1, "load_avg_5": 1.2, "load_avg_15": 1.3}
 MOCK_LOAD_AVG = list(MOCK_LOAD_AVG_HTTP.values())