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

Don't create repairs asking user to remove duplicate ignored config entries (#130056)

Browse source
This commit is contained in:
Erik Montnemery 2024-11-07 17:07:23 +01:00 • committed by GitHub
parent 0e324c074a
commit c5e3ba536c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
homeassistant/config_entries.py
View file

@ -2437,6 +2437,17 @@ class ConfigEntries:
for domain, unique_ids in self._entries._domain_unique_id_index.items(): # noqa: SLF001 for domain, unique_ids in self._entries._domain_unique_id_index.items(): # noqa: SLF001
for unique_id, entries in unique_ids.items(): for unique_id, entries in unique_ids.items():
# We might mutate the list of entries, so we need a copy to not mess up
# the index
entries = list(entries)
# There's no need to raise an issue for ignored entries, we can
# safely remove them once we no longer allow unique id collisions.
# Iterate over a copy of the copy to allow mutating while iterating
for entry in list(entries):
if entry.source == SOURCE_IGNORE:
entries.remove(entry)
if len(entries) < 2: if len(entries) < 2:
continue continue
issue_id = f"{ISSUE_UNIQUE_ID_COLLISION}_{domain}_{unique_id}" issue_id = f"{ISSUE_UNIQUE_ID_COLLISION}_{domain}_{unique_id}"

8
tests/test_config_entries.py
View file

@ -7224,6 +7224,12 @@ async def test_unique_id_collision_issues(
for _ in range(6): for _ in range(6):
test3.append(MockConfigEntry(domain="test3", unique_id="not_unique")) test3.append(MockConfigEntry(domain="test3", unique_id="not_unique"))
await manager.async_add(test3[-1]) await manager.async_add(test3[-1])
# Add an ignored config entry
await manager.async_add(
MockConfigEntry(
domain="test2", unique_id="group_1", source=config_entries.SOURCE_IGNORE
)
)
# Check we get one issue for domain test2 and one issue for domain test3 # Check we get one issue for domain test2 and one issue for domain test3
assert len(issue_registry.issues) == 2 assert len(issue_registry.issues) == 2
@ -7270,7 +7276,7 @@ async def test_unique_id_collision_issues(
(HOMEASSISTANT_DOMAIN, "config_entry_unique_id_collision_test2_group_2"), (HOMEASSISTANT_DOMAIN, "config_entry_unique_id_collision_test2_group_2"),
} }
# Remove the last test2 group2 duplicate, a new issue is created # Remove the last test2 group2 duplicate, the issue is cleared
await manager.async_remove(test2_group_2[1].entry_id) await manager.async_remove(test2_group_2[1].entry_id)
assert not issue_registry.issues assert not issue_registry.issues