jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 03:07:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix yale_smart_alarm on missing key (#125508)

Browse Source
This commit is contained in:
G Johansson 2024-09-08 14:06:40 +02:00 committed by GitHub
parent c0ee12ca41
commit 26ede9a679
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 854 additions and 833 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
homeassistant/components/yale_smart_alarm/coordinator.py
View File

@ -154,10 +154,15 @@ class YaleDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
except YALE_BASE_ERRORS as error: except YALE_BASE_ERRORS as error:
raise UpdateFailed from error raise UpdateFailed from error
cycle = data.cycle["data"] if data.cycle else None
status = data.status["data"] if data.status else None
online = data.online["data"] if data.online else None
panel_info = data.panel_info["data"] if data.panel_info else None
return { return {
"arm_status": arm_status, "arm_status": arm_status,
"cycle": data.cycle, "cycle": cycle,
"status": data.status, "status": status,
"online": data.online, "online": online,
"panel_info": data.panel_info, "panel_info": panel_info,
} }

24
tests/components/yale_smart_alarm/conftest.py
View File

@ -82,10 +82,10 @@ def get_fixture_data() -> dict[str, Any]:
def get_update_data(loaded_fixture: dict[str, Any]) -> YaleSmartAlarmData: def get_update_data(loaded_fixture: dict[str, Any]) -> YaleSmartAlarmData:
"""Load update data and return.""" """Load update data and return."""
status = loaded_fixture["STATUS"] status = {"data": loaded_fixture["STATUS"]}
cycle = loaded_fixture["CYCLE"] cycle = {"data": loaded_fixture["CYCLE"]}
online = loaded_fixture["ONLINE"] online = {"data": loaded_fixture["ONLINE"]}
panel_info = loaded_fixture["PANEL INFO"] panel_info = {"data": loaded_fixture["PANEL INFO"]}
return YaleSmartAlarmData( return YaleSmartAlarmData(
status=status, status=status,
cycle=cycle, cycle=cycle,
@ -98,14 +98,14 @@ def get_update_data(loaded_fixture: dict[str, Any]) -> YaleSmartAlarmData:
def get_diag_data(loaded_fixture: dict[str, Any]) -> YaleSmartAlarmData: def get_diag_data(loaded_fixture: dict[str, Any]) -> YaleSmartAlarmData:
"""Load all data and return.""" """Load all data and return."""
devices = loaded_fixture["DEVICES"] devices = {"data": loaded_fixture["DEVICES"]}
mode = loaded_fixture["MODE"] mode = {"data": loaded_fixture["MODE"]}
status = loaded_fixture["STATUS"] status = {"data": loaded_fixture["STATUS"]}
cycle = loaded_fixture["CYCLE"] cycle = {"data": loaded_fixture["CYCLE"]}
online = loaded_fixture["ONLINE"] online = {"data": loaded_fixture["ONLINE"]}
history = loaded_fixture["HISTORY"] history = {"data": loaded_fixture["HISTORY"]}
panel_info = loaded_fixture["PANEL INFO"] panel_info = {"data": loaded_fixture["PANEL INFO"]}
auth_check = loaded_fixture["AUTH CHECK"] auth_check = {"data": loaded_fixture["AUTH CHECK"]}
return YaleSmartAlarmData( return YaleSmartAlarmData(
devices=devices, devices=devices,
mode=mode, mode=mode,

24
tests/components/yale_smart_alarm/snapshots/test_diagnostics.ambr
View File

@ -2,6 +2,7 @@
# name: test_diagnostics # name: test_diagnostics
dict({ dict({
'auth_check': dict({ 'auth_check': dict({
'data': dict({
'agent': False, 'agent': False,
'dealer_group': 'yale', 'dealer_group': 'yale',
'dealer_id': '605', 'dealer_id': '605',
@ -16,7 +17,9 @@
'user_id': '**REDACTED**', 'user_id': '**REDACTED**',
'xml_version': '2', 'xml_version': '2',
}), }),
}),
'cycle': dict({ 'cycle': dict({
'data': dict({
'alarm_event_latest': None, 'alarm_event_latest': None,
'capture_latest': None, 'capture_latest': None,
'device_status': list([ 'device_status': list([
@ -650,7 +653,9 @@
'utc_event_time': None, 'utc_event_time': None,
}), }),
}), }),
'devices': list([ }),
'devices': dict({
'data': list([
dict({ dict({
'address': '**REDACTED**', 'address': '**REDACTED**',
'area': '1', 'area': '1',
@ -1249,7 +1254,9 @@
'type_no': '40', 'type_no': '40',
}), }),
]), ]),
'history': list([ }),
'history': dict({
'data': list([
dict({ dict({
'area': 1, 'area': 1,
'cid': '18180701000', 'cid': '18180701000',
@ -1391,14 +1398,20 @@
'zone': 1, 'zone': 1,
}), }),
]), ]),
'mode': list([ }),
'mode': dict({
'data': list([
dict({ dict({
'area': '1', 'area': '1',
'mode': 'disarm', 'mode': 'disarm',
}), }),
]), ]),
'online': 'online', }),
'online': dict({
'data': 'online',
}),
'panel_info': dict({ 'panel_info': dict({
'data': dict({
'SMS_Balance': '50', 'SMS_Balance': '50',
'contact': '', 'contact': '',
'dealer_name': 'Poland', 'dealer_name': 'Poland',
@ -1416,7 +1429,9 @@
'zb_version': '4.1.2.6.2', 'zb_version': '4.1.2.6.2',
'zw_version': '', 'zw_version': '',
}), }),
}),
'status': dict({ 'status': dict({
'data': dict({
'acfail': 'main.normal', 'acfail': 'main.normal',
'battery': 'main.normal', 'battery': 'main.normal',
'gsm_rssi': '0', 'gsm_rssi': '0',
@ -1426,5 +1441,6 @@
'rssi': '1', 'rssi': '1',
'tamper': 'main.normal', 'tamper': 'main.normal',
}), }),
}),
}) })
# --- # ---

6
tests/components/yale_smart_alarm/test_lock.py
View File

@ -55,7 +55,7 @@ async def test_lock_service_calls(
client = load_config_entry[1] client = load_config_entry[1]
data = deepcopy(get_data.cycle) data = deepcopy(get_data.cycle)
data["data"] = data.pop("device_status") data["data"] = data["data"].pop("device_status")
client.auth.get_authenticated = Mock(return_value=data) client.auth.get_authenticated = Mock(return_value=data)
client.auth.post_authenticated = Mock(return_value={"code": "000"}) client.auth.post_authenticated = Mock(return_value={"code": "000"})
@ -109,7 +109,7 @@ async def test_lock_service_call_fails(
client = load_config_entry[1] client = load_config_entry[1]
data = deepcopy(get_data.cycle) data = deepcopy(get_data.cycle)
data["data"] = data.pop("device_status") data["data"] = data["data"].pop("device_status")
client.auth.get_authenticated = Mock(return_value=data) client.auth.get_authenticated = Mock(return_value=data)
client.auth.post_authenticated = Mock(side_effect=UnknownError("test_side_effect")) client.auth.post_authenticated = Mock(side_effect=UnknownError("test_side_effect"))
@ -161,7 +161,7 @@ async def test_lock_service_call_fails_with_incorrect_status(
client = load_config_entry[1] client = load_config_entry[1]
data = deepcopy(get_data.cycle) data = deepcopy(get_data.cycle)
data["data"] = data.pop("device_status") data["data"] = data["data"].pop("device_status")
client.auth.get_authenticated = Mock(return_value=data) client.auth.get_authenticated = Mock(return_value=data)
client.auth.post_authenticated = Mock(return_value={"code": "FFF"}) client.auth.post_authenticated = Mock(return_value={"code": "FFF"})