evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change name to entity_id update platform error messages (#87960)

Browse source
This commit is contained in:
G Johansson 2023-02-12 22:18:09 +01:00 • committed by GitHub
parent bb4d6c0d2c
commit 8c00f435a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
homeassistant/components/update/__init__.py
View file

@ -130,7 +130,7 @@ async def async_install(entity: UpdateEntity, service_call: ServiceCall) -> None
entity.installed_version == entity.latest_version entity.installed_version == entity.latest_version
or entity.latest_version is None or entity.latest_version is None
): ):
raise HomeAssistantError(f"No update available for {entity.name}") raise HomeAssistantError(f"No update available for {entity.entity_id}")
# If version is specified, but not supported by the entity. # If version is specified, but not supported by the entity.
if ( if (
@ -138,19 +138,19 @@ async def async_install(entity: UpdateEntity, service_call: ServiceCall) -> None
and not entity.supported_features & UpdateEntityFeature.SPECIFIC_VERSION and not entity.supported_features & UpdateEntityFeature.SPECIFIC_VERSION
): ):
raise HomeAssistantError( raise HomeAssistantError(
f"Installing a specific version is not supported for {entity.name}" f"Installing a specific version is not supported for {entity.entity_id}"
) )
# If backup is requested, but not supported by the entity. # If backup is requested, but not supported by the entity.
if ( if (
backup := service_call.data[ATTR_BACKUP] backup := service_call.data[ATTR_BACKUP]
) and not entity.supported_features & UpdateEntityFeature.BACKUP: ) and not entity.supported_features & UpdateEntityFeature.BACKUP:
raise HomeAssistantError(f"Backup is not supported for {entity.name}") raise HomeAssistantError(f"Backup is not supported for {entity.entity_id}")
# Update is already in progress. # Update is already in progress.
if entity.in_progress is not False: if entity.in_progress is not False:
raise HomeAssistantError( raise HomeAssistantError(
f"Update installation already in progress for {entity.name}" f"Update installation already in progress for {entity.entity_id}"
) )
await entity.async_install_with_progress(version, backup) await entity.async_install_with_progress(version, backup)
@ -159,7 +159,9 @@ async def async_install(entity: UpdateEntity, service_call: ServiceCall) -> None
async def async_skip(entity: UpdateEntity, service_call: ServiceCall) -> None: async def async_skip(entity: UpdateEntity, service_call: ServiceCall) -> None:
"""Service call wrapper to validate the call.""" """Service call wrapper to validate the call."""
if entity.auto_update: if entity.auto_update:
raise HomeAssistantError(f"Skipping update is not supported for {entity.name}") raise HomeAssistantError(
f"Skipping update is not supported for {entity.entity_id}"
)
await entity.async_skip() await entity.async_skip()
@ -167,7 +169,7 @@ async def async_clear_skipped(entity: UpdateEntity, service_call: ServiceCall) -
"""Service call wrapper to validate the call.""" """Service call wrapper to validate the call."""
if entity.auto_update: if entity.auto_update:
raise HomeAssistantError( raise HomeAssistantError(
f"Clearing skipped update is not supported for {entity.name}" f"Clearing skipped update is not supported for {entity.entity_id}"
) )
await entity.async_clear_skipped() await entity.async_clear_skipped()

4
tests/components/update/test_init.py
View file

@ -297,7 +297,7 @@ async def test_entity_with_auto_update(
# Should not be able to skip the update # Should not be able to skip the update
with pytest.raises( with pytest.raises(
HomeAssistantError, HomeAssistantError,
match="Skipping update is not supported for Update with auto update", match="Skipping update is not supported for update.update_with_auto_update",
): ):
await hass.services.async_call( await hass.services.async_call(
DOMAIN, DOMAIN,
@ -309,7 +309,7 @@ async def test_entity_with_auto_update(
# Should not be able to clear a skipped the update # Should not be able to clear a skipped the update
with pytest.raises( with pytest.raises(
HomeAssistantError, HomeAssistantError,
match="Clearing skipped update is not supported for Update with auto update", match="Clearing skipped update is not supported for update.update_with_auto_update",
): ):
await hass.services.async_call( await hass.services.async_call(
DOMAIN, DOMAIN,