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

Rename BackupManager last_non_idle_event to last_action_event (#140291)

Browse Source 
* Rename BackupManager last_non_idle_event to last_action_event

* Update snapshots
This commit is contained in:
Erik Montnemery 2025-03-19 17:28:40 +01:00 committed by GitHub
parent 2c9eb288e3
commit 05c61b7ec3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
homeassistant/components/backup/manager.py
View File

@ -351,7 +351,7 @@ class BackupManager:
# Latest backup event and backup event subscribers # Latest backup event and backup event subscribers
self.last_event: ManagerStateEvent = BlockedEvent() self.last_event: ManagerStateEvent = BlockedEvent()
self.last_non_idle_event: ManagerStateEvent | None = None self.last_action_event: ManagerStateEvent | None = None
self._backup_event_subscriptions = hass.data[ self._backup_event_subscriptions = hass.data[
DATA_BACKUP DATA_BACKUP
].backup_event_subscriptions ].backup_event_subscriptions
@ -1337,7 +1337,7 @@ class BackupManager:
LOGGER.debug("Backup state: %s -> %s", current_state, new_state) LOGGER.debug("Backup state: %s -> %s", current_state, new_state)
self.last_event = event self.last_event = event
if not isinstance(event, (BlockedEvent, IdleEvent)): if not isinstance(event, (BlockedEvent, IdleEvent)):
self.last_non_idle_event = event self.last_action_event = event
for subscription in self._backup_event_subscriptions: for subscription in self._backup_event_subscriptions:
subscription(event) subscription(event)

2
homeassistant/components/backup/websocket.py
View File

@ -55,7 +55,7 @@ async def handle_info(
"backups": list(backups.values()), "backups": list(backups.values()),
"last_attempted_automatic_backup": manager.config.data.last_attempted_automatic_backup, "last_attempted_automatic_backup": manager.config.data.last_attempted_automatic_backup,
"last_completed_automatic_backup": manager.config.data.last_completed_automatic_backup, "last_completed_automatic_backup": manager.config.data.last_completed_automatic_backup,
"last_non_idle_event": manager.last_non_idle_event, "last_action_event": manager.last_action_event,
"next_automatic_backup": manager.config.data.schedule.next_automatic_backup, "next_automatic_backup": manager.config.data.schedule.next_automatic_backup,
"next_automatic_backup_additional": manager.config.data.schedule.next_automatic_backup_additional, "next_automatic_backup_additional": manager.config.data.schedule.next_automatic_backup_additional,
"state": manager.state, "state": manager.state,

2
homeassistant/components/onboarding/views.py
View File

@ -367,7 +367,7 @@ class BackupInfoView(BackupOnboardingView):
{ {
"backups": list(backups.values()), "backups": list(backups.values()),
"state": manager.state, "state": manager.state,
"last_non_idle_event": manager.last_non_idle_event, "last_action_event": manager.last_action_event,
} }
) )

10
tests/components/backup/snapshots/test_backup.ambr
View File

@ -114,9 +114,9 @@
'with_automatic_settings': None, 'with_automatic_settings': None,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -148,9 +148,9 @@
}), }),
'backups': list([ 'backups': list([
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -182,9 +182,9 @@
}), }),
'backups': list([ 'backups': list([
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -216,9 +216,9 @@
}), }),
'backups': list([ 'backups': list([
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -250,9 +250,9 @@
}), }),
'backups': list([ 'backups': list([
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',

46
tests/components/backup/snapshots/test_websocket.ambr
View File

@ -3951,9 +3951,9 @@
}), }),
'backups': list([ 'backups': list([
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -3981,9 +3981,9 @@
}), }),
'backups': list([ 'backups': list([
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -4032,9 +4032,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -4062,9 +4062,9 @@
}), }),
'backups': list([ 'backups': list([
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -4113,9 +4113,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -4175,9 +4175,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -4221,9 +4221,9 @@
'with_automatic_settings': None, 'with_automatic_settings': None,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -4278,9 +4278,9 @@
'with_automatic_settings': None, 'with_automatic_settings': None,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -4333,9 +4333,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -4395,9 +4395,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -4458,9 +4458,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -4522,9 +4522,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -4584,9 +4584,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -4646,9 +4646,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -4709,9 +4709,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -4773,9 +4773,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -5350,9 +5350,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -5401,9 +5401,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -5456,9 +5456,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -5534,9 +5534,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -5586,9 +5586,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -5638,9 +5638,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',
@ -5690,9 +5690,9 @@
'with_automatic_settings': True, 'with_automatic_settings': True,
}), }),
]), ]),
'last_action_event': None,
'last_attempted_automatic_backup': None, 'last_attempted_automatic_backup': None,
'last_completed_automatic_backup': None, 'last_completed_automatic_backup': None,
'last_non_idle_event': None,
'next_automatic_backup': None, 'next_automatic_backup': None,
'next_automatic_backup_additional': False, 'next_automatic_backup_additional': False,
'state': 'idle', 'state': 'idle',

44
tests/components/backup/test_manager.py
View File

@ -538,7 +538,7 @@ async def test_initiate_backup(
"agent_errors": {}, "agent_errors": {},
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",
@ -771,7 +771,7 @@ async def test_initiate_backup_with_agent_error(
"agent_errors": {}, "agent_errors": {},
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",
@ -863,7 +863,7 @@ async def test_initiate_backup_with_agent_error(
"agent_errors": {}, "agent_errors": {},
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": { "last_action_event": {
"manager_state": "create_backup", "manager_state": "create_backup",
"reason": "upload_failed", "reason": "upload_failed",
"stage": None, "stage": None,
@ -1153,7 +1153,7 @@ async def test_initiate_backup_non_agent_upload_error(
"agent_errors": {}, "agent_errors": {},
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",
@ -1250,7 +1250,7 @@ async def test_initiate_backup_with_task_error(
"agent_errors": {}, "agent_errors": {},
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",
@ -1346,7 +1346,7 @@ async def test_initiate_backup_file_error_upload_to_agents(
"agent_errors": {}, "agent_errors": {},
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",
@ -1470,7 +1470,7 @@ async def test_initiate_backup_file_error_create_backup(
"agent_errors": {}, "agent_errors": {},
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",
@ -1967,7 +1967,7 @@ async def test_receive_backup_agent_error(
"agent_errors": {}, "agent_errors": {},
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",
@ -2050,7 +2050,7 @@ async def test_receive_backup_agent_error(
"agent_errors": {}, "agent_errors": {},
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": { "last_action_event": {
"manager_state": "receive_backup", "manager_state": "receive_backup",
"reason": None, "reason": None,
"stage": None, "stage": None,
@ -2103,7 +2103,7 @@ async def test_receive_backup_non_agent_upload_error(
"agent_errors": {}, "agent_errors": {},
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",
@ -2215,7 +2215,7 @@ async def test_receive_backup_file_write_error(
"agent_errors": {}, "agent_errors": {},
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",
@ -2311,7 +2311,7 @@ async def test_receive_backup_read_tar_error(
"agent_errors": {}, "agent_errors": {},
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",
@ -2476,7 +2476,7 @@ async def test_receive_backup_file_read_error(
"agent_errors": {}, "agent_errors": {},
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",
@ -3287,7 +3287,7 @@ async def test_initiate_backup_per_agent_encryption(
"agent_errors": {}, "agent_errors": {},
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",
@ -3390,7 +3390,7 @@ async def test_initiate_backup_per_agent_encryption(
@pytest.mark.parametrize( @pytest.mark.parametrize(
("restore_result", "last_non_idle_event"), ("restore_result", "last_action_event"),
[ [
( (
{"error": None, "error_type": None, "success": True}, {"error": None, "error_type": None, "success": True},
@ -3416,7 +3416,7 @@ async def test_restore_progress_after_restart(
hass: HomeAssistant, hass: HomeAssistant,
hass_ws_client: WebSocketGenerator, hass_ws_client: WebSocketGenerator,
restore_result: dict[str, Any], restore_result: dict[str, Any],
last_non_idle_event: dict[str, Any], last_action_event: dict[str, Any],
) -> None: ) -> None:
"""Test restore backup progress after restart.""" """Test restore backup progress after restart."""
@ -3434,7 +3434,7 @@ async def test_restore_progress_after_restart(
"backups": [], "backups": [],
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": last_non_idle_event, "last_action_event": last_action_event,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",
@ -3460,7 +3460,7 @@ async def test_restore_progress_after_restart_fail_to_remove(
"backups": [], "backups": [],
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",
@ -3485,20 +3485,20 @@ async def test_manager_blocked_until_home_assistant_started(
manager = hass.data[DATA_MANAGER] manager = hass.data[DATA_MANAGER]
assert manager.state == BackupManagerState.BLOCKED assert manager.state == BackupManagerState.BLOCKED
assert manager.last_non_idle_event is None assert manager.last_action_event is None
# Fired when Home Assistant changes to starting state # Fired when Home Assistant changes to starting state
hass.bus.async_fire(EVENT_HOMEASSISTANT_START) hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
await hass.async_block_till_done() await hass.async_block_till_done()
await hass.async_block_till_done() await hass.async_block_till_done()
assert manager.state == BackupManagerState.BLOCKED assert manager.state == BackupManagerState.BLOCKED
assert manager.last_non_idle_event is None assert manager.last_action_event is None
# Fired when Home Assistant changes to running state # Fired when Home Assistant changes to running state
hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED) hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
await hass.async_block_till_done() await hass.async_block_till_done()
assert manager.state == BackupManagerState.IDLE assert manager.state == BackupManagerState.IDLE
assert manager.last_non_idle_event is None assert manager.last_action_event is None
async def test_manager_not_blocked_after_restore( async def test_manager_not_blocked_after_restore(
@ -3523,7 +3523,7 @@ async def test_manager_not_blocked_after_restore(
"backups": [], "backups": [],
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": { "last_action_event": {
"manager_state": "restore_backup", "manager_state": "restore_backup",
"reason": None, "reason": None,
"stage": None, "stage": None,

2
tests/components/cloud/test_backup.py
View File

@ -208,7 +208,7 @@ async def test_agents_list_backups_fail_cloud(
"backups": [], "backups": [],
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",

10
tests/components/hassio/test_backup.py
View File

@ -2394,7 +2394,7 @@ async def test_reader_writer_restore_wrong_parameters(
@pytest.mark.parametrize( @pytest.mark.parametrize(
("get_job_result", "last_non_idle_event"), ("get_job_result", "last_action_event"),
[ [
( (
TEST_JOB_DONE, TEST_JOB_DONE,
@ -2422,7 +2422,7 @@ async def test_restore_progress_after_restart(
hass_ws_client: WebSocketGenerator, hass_ws_client: WebSocketGenerator,
supervisor_client: AsyncMock, supervisor_client: AsyncMock,
get_job_result: supervisor_jobs.Job, get_job_result: supervisor_jobs.Job,
last_non_idle_event: dict[str, Any], last_action_event: dict[str, Any],
) -> None: ) -> None:
"""Test restore backup progress after restart.""" """Test restore backup progress after restart."""
@ -2438,7 +2438,7 @@ async def test_restore_progress_after_restart(
response = await client.receive_json() response = await client.receive_json()
assert response["success"] assert response["success"]
assert response["result"]["last_non_idle_event"] == last_non_idle_event assert response["result"]["last_action_event"] == last_action_event
assert response["result"]["state"] == "idle" assert response["result"]["state"] == "idle"
@ -2516,7 +2516,7 @@ async def test_restore_progress_after_restart_report_progress(
response = await client.receive_json() response = await client.receive_json()
assert response["success"] assert response["success"]
assert response["result"]["last_non_idle_event"] == { assert response["result"]["last_action_event"] == {
"manager_state": "restore_backup", "manager_state": "restore_backup",
"reason": None, "reason": None,
"stage": "addons", "stage": "addons",
@ -2545,7 +2545,7 @@ async def test_restore_progress_after_restart_unknown_job(
response = await client.receive_json() response = await client.receive_json()
assert response["success"] assert response["success"]
assert response["result"]["last_non_idle_event"] is None assert response["result"]["last_action_event"] is None
assert response["result"]["state"] == "idle" assert response["result"]["state"] == "idle"

2
tests/components/onboarding/snapshots/test_views.ambr
View File

@ -62,7 +62,7 @@
'with_automatic_settings': None, 'with_automatic_settings': None,
}), }),
]), ]),
'last_non_idle_event': None, 'last_action_event': None,
'state': 'idle', 'state': 'idle',
}) })
# --- # ---

2
tests/components/synology_dsm/test_backup.py
View File

@ -338,7 +338,7 @@ async def test_agents_list_backups_error(
"backups": [], "backups": [],
"last_attempted_automatic_backup": None, "last_attempted_automatic_backup": None,
"last_completed_automatic_backup": None, "last_completed_automatic_backup": None,
"last_non_idle_event": None, "last_action_event": None,
"next_automatic_backup": None, "next_automatic_backup": None,
"next_automatic_backup_additional": False, "next_automatic_backup_additional": False,
"state": "idle", "state": "idle",