From 82f54eb9d221ddc46a731b912e6203ca8f6cd173 Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Sat, 21 Dec 2024 09:38:59 +0100 Subject: [PATCH] Adjust the default backup name (#133668) --- homeassistant/components/backup/manager.py | 5 ++++- tests/components/backup/snapshots/test_websocket.ambr | 6 +++--- tests/components/backup/test_manager.py | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/homeassistant/components/backup/manager.py b/homeassistant/components/backup/manager.py index a27c1cc7170..9b20c82d709 100644 --- a/homeassistant/components/backup/manager.py +++ b/homeassistant/components/backup/manager.py @@ -726,7 +726,10 @@ class BackupManager: "Cannot include all addons and specify specific addons" ) - backup_name = name or f"Core {HAVERSION}" + backup_name = ( + name + or f"{"Automatic" if with_automatic_settings else "Custom"} {HAVERSION}" + ) new_backup, self._backup_task = await self._reader_writer.async_create_backup( agent_ids=agent_ids, backup_name=backup_name, diff --git a/tests/components/backup/snapshots/test_websocket.ambr b/tests/components/backup/snapshots/test_websocket.ambr index 4de06861b67..16640a95ddb 100644 --- a/tests/components/backup/snapshots/test_websocket.ambr +++ b/tests/components/backup/snapshots/test_websocket.ambr @@ -2574,7 +2574,7 @@ dict({ 'id': 2, 'result': dict({ - 'backup_job_id': '27f5c632', + 'backup_job_id': 'fceef4e6', }), 'success': True, 'type': 'result', @@ -2645,7 +2645,7 @@ dict({ 'id': 2, 'result': dict({ - 'backup_job_id': '27f5c632', + 'backup_job_id': 'fceef4e6', }), 'success': True, 'type': 'result', @@ -2716,7 +2716,7 @@ dict({ 'id': 2, 'result': dict({ - 'backup_job_id': '27f5c632', + 'backup_job_id': 'fceef4e6', }), 'success': True, 'type': 'result', diff --git a/tests/components/backup/test_manager.py b/tests/components/backup/test_manager.py index 1c45c86149b..9b652edb087 100644 --- a/tests/components/backup/test_manager.py +++ b/tests/components/backup/test_manager.py @@ -121,7 +121,7 @@ async def test_async_create_backup( assert create_backup.called assert create_backup.call_args == call( agent_ids=["backup.local"], - backup_name="Core 2025.1.0", + backup_name="Custom 2025.1.0", extra_metadata={ "instance_id": hass.data["core.uuid"], "with_automatic_settings": False, @@ -254,7 +254,7 @@ async def test_async_initiate_backup( ws_client = await hass_ws_client(hass) include_database = params.get("include_database", True) - name = params.get("name", "Core 2025.1.0") + name = params.get("name", "Custom 2025.1.0") password = params.get("password") path_glob.return_value = [] @@ -502,7 +502,7 @@ async def test_async_initiate_backup_with_agent_error( "folders": [], "homeassistant_included": True, "homeassistant_version": "2025.1.0", - "name": "Core 2025.1.0", + "name": "Custom 2025.1.0", "protected": False, "size": 123, "with_automatic_settings": False,