From d01f85b6aa21239a918552735f45614ce147d199 Mon Sep 17 00:00:00 2001 From: Kevin Stillhammer Date: Tue, 11 Oct 2022 11:05:53 +0200 Subject: [PATCH] Remove old import logic for waze_travel_time (#80079) Remove old import logic --- .../components/waze_travel_time/__init__.py | 15 ++----------- .../components/waze_travel_time/test_init.py | 21 ------------------- 2 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 tests/components/waze_travel_time/test_init.py diff --git a/homeassistant/components/waze_travel_time/__init__.py b/homeassistant/components/waze_travel_time/__init__.py index 4e82af5119c..806672b3608 100644 --- a/homeassistant/components/waze_travel_time/__init__.py +++ b/homeassistant/components/waze_travel_time/__init__.py @@ -2,24 +2,13 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.const import Platform from homeassistant.core import HomeAssistant -from homeassistant.helpers.entity_registry import ( - async_entries_for_config_entry, - async_get, -) PLATFORMS = [Platform.SENSOR] -async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: +async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool: """Load the saved entities.""" - if entry.unique_id is not None: - hass.config_entries.async_update_entry(entry, unique_id=None) - - ent_reg = async_get(hass) - for entity in async_entries_for_config_entry(ent_reg, entry.entry_id): - ent_reg.async_update_entity(entity.entity_id, new_unique_id=entry.entry_id) - - await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS) + await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS) return True diff --git a/tests/components/waze_travel_time/test_init.py b/tests/components/waze_travel_time/test_init.py deleted file mode 100644 index bf8f6a95844..00000000000 --- a/tests/components/waze_travel_time/test_init.py +++ /dev/null @@ -1,21 +0,0 @@ -"""Test Waze Travel Time initialization.""" -from homeassistant.components.waze_travel_time.const import DOMAIN -from homeassistant.helpers.entity_registry import async_get - -from tests.common import MockConfigEntry - - -async def test_migration(hass, bypass_platform_setup): - """Test migration logic for unique id.""" - config_entry = MockConfigEntry( - domain=DOMAIN, version=1, entry_id="test", unique_id="test" - ) - ent_reg = async_get(hass) - ent_entry = ent_reg.async_get_or_create( - "sensor", DOMAIN, unique_id="replaceable_unique_id", config_entry=config_entry - ) - entity_id = ent_entry.entity_id - config_entry.add_to_hass(hass) - await hass.config_entries.async_setup(config_entry.entry_id) - assert config_entry.unique_id is None - assert ent_reg.async_get(entity_id).unique_id == config_entry.entry_id