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

Print the exact reason if the WebSocket event to Core fails (#5609)

Browse Source 
* Print the exact reason if the WebSocket event to Core fails

* Improve error at backup end too, fix tests

* Fix text

* Address ruff check issue
This commit is contained in:
Stefan Agner 2025-02-06 18:17:46 +01:00 committed by GitHub
parent 2078044062
commit 7348745049
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
supervisor/homeassistant/module.py
View File

@ -359,7 +359,7 @@ class HomeAssistant(FileConfiguration, CoreSysAttributes):
) )
except HomeAssistantWSError as err: except HomeAssistantWSError as err:
raise HomeAssistantBackupError( raise HomeAssistantBackupError(
"Preparing backup of Home Assistant Core failed. Check HA Core logs.", f"Preparing backup of Home Assistant Core failed. Failed to inform HA Core: {str(err)}.",
_LOGGER.error, _LOGGER.error,
) from err ) from err
@ -376,9 +376,10 @@ class HomeAssistant(FileConfiguration, CoreSysAttributes):
resp = await self.websocket.async_send_command( resp = await self.websocket.async_send_command(
{ATTR_TYPE: WSType.BACKUP_END} {ATTR_TYPE: WSType.BACKUP_END}
) )
except HomeAssistantWSError: except HomeAssistantWSError as err:
_LOGGER.warning( _LOGGER.warning(
"Error resuming normal operations after backup of Home Assistant Core. Check HA Core logs." "Error resuming normal operations after backup of Home Assistant Core. Failed to inform HA Core: %s.",
str(err),
) )
else: else:
if resp and not resp.get(ATTR_SUCCESS): if resp and not resp.get(ATTR_SUCCESS):

8
tests/homeassistant/test_module.py
View File

@ -90,13 +90,13 @@ async def test_begin_backup_ws_error(coresys: CoreSys):
"""Test WS error when beginning backup.""" """Test WS error when beginning backup."""
# pylint: disable-next=protected-access # pylint: disable-next=protected-access
coresys.homeassistant.websocket._client.async_send_command.side_effect = ( coresys.homeassistant.websocket._client.async_send_command.side_effect = (
HomeAssistantWSConnectionError HomeAssistantWSConnectionError("Connection was closed")
) )
with ( with (
patch.object(HomeAssistantWebSocket, "_can_send", return_value=True), patch.object(HomeAssistantWebSocket, "_can_send", return_value=True),
pytest.raises( pytest.raises(
HomeAssistantBackupError, HomeAssistantBackupError,
match="Preparing backup of Home Assistant Core failed. Check HA Core logs.", match="Preparing backup of Home Assistant Core failed. Failed to inform HA Core: Connection was closed.",
), ),
): ):
await coresys.homeassistant.begin_backup() await coresys.homeassistant.begin_backup()
@ -106,13 +106,13 @@ async def test_end_backup_ws_error(coresys: CoreSys, caplog: pytest.LogCaptureFi
"""Test WS error when ending backup.""" """Test WS error when ending backup."""
# pylint: disable-next=protected-access # pylint: disable-next=protected-access
coresys.homeassistant.websocket._client.async_send_command.side_effect = ( coresys.homeassistant.websocket._client.async_send_command.side_effect = (
HomeAssistantWSConnectionError HomeAssistantWSConnectionError("Connection was closed")
) )
with patch.object(HomeAssistantWebSocket, "_can_send", return_value=True): with patch.object(HomeAssistantWebSocket, "_can_send", return_value=True):
await coresys.homeassistant.end_backup() await coresys.homeassistant.end_backup()
assert ( assert (
"Error resuming normal operations after backup of Home Assistant Core. Check HA Core logs." "Error resuming normal operations after backup of Home Assistant Core. Failed to inform HA Core: Connection was closed."
in caplog.text in caplog.text
) )