diff --git a/supervisor/homeassistant/module.py b/supervisor/homeassistant/module.py index 00762c7f0..d652b3661 100644 --- a/supervisor/homeassistant/module.py +++ b/supervisor/homeassistant/module.py @@ -359,7 +359,7 @@ class HomeAssistant(FileConfiguration, CoreSysAttributes): ) except HomeAssistantWSError as err: 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, ) from err @@ -376,9 +376,10 @@ class HomeAssistant(FileConfiguration, CoreSysAttributes): resp = await self.websocket.async_send_command( {ATTR_TYPE: WSType.BACKUP_END} ) - except HomeAssistantWSError: + except HomeAssistantWSError as err: _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: if resp and not resp.get(ATTR_SUCCESS): diff --git a/tests/homeassistant/test_module.py b/tests/homeassistant/test_module.py index 3bfd3c0f4..70f8fe75f 100644 --- a/tests/homeassistant/test_module.py +++ b/tests/homeassistant/test_module.py @@ -90,13 +90,13 @@ async def test_begin_backup_ws_error(coresys: CoreSys): """Test WS error when beginning backup.""" # pylint: disable-next=protected-access coresys.homeassistant.websocket._client.async_send_command.side_effect = ( - HomeAssistantWSConnectionError + HomeAssistantWSConnectionError("Connection was closed") ) with ( patch.object(HomeAssistantWebSocket, "_can_send", return_value=True), pytest.raises( 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() @@ -106,13 +106,13 @@ async def test_end_backup_ws_error(coresys: CoreSys, caplog: pytest.LogCaptureFi """Test WS error when ending backup.""" # pylint: disable-next=protected-access coresys.homeassistant.websocket._client.async_send_command.side_effect = ( - HomeAssistantWSConnectionError + HomeAssistantWSConnectionError("Connection was closed") ) with patch.object(HomeAssistantWebSocket, "_can_send", return_value=True): await coresys.homeassistant.end_backup() 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 )