From 39691faccc6f15fc7a957f3981824a8e80fffa67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 23 Nov 2021 11:04:33 +0200 Subject: [PATCH] Use DeviceEntryType in non-typechecked code too (#58646) --- homeassistant/components/climacell/__init__.py | 3 ++- homeassistant/components/coinbase/sensor.py | 5 +++-- homeassistant/components/deconz/gateway.py | 2 +- homeassistant/components/eafm/sensor.py | 3 ++- homeassistant/components/hassio/__init__.py | 11 +++++++---- homeassistant/components/homekit/__init__.py | 2 +- homeassistant/components/met_eireann/weather.py | 3 ++- homeassistant/components/meteo_france/sensor.py | 3 ++- homeassistant/components/meteo_france/weather.py | 3 ++- homeassistant/components/meteoclimatic/sensor.py | 3 ++- homeassistant/components/meteoclimatic/weather.py | 3 ++- homeassistant/components/nightscout/__init__.py | 2 +- homeassistant/components/nws/__init__.py | 3 ++- homeassistant/components/ovo_energy/__init__.py | 3 ++- homeassistant/components/plex/media_player.py | 3 ++- homeassistant/components/spotify/media_player.py | 3 ++- homeassistant/components/unifi/switch.py | 3 ++- homeassistant/components/xbox/base_sensor.py | 3 ++- tests/components/config/test_device_registry.py | 4 ++-- tests/components/deconz/test_gateway.py | 2 +- tests/components/kraken/test_sensor.py | 3 ++- tests/components/picnic/test_sensor.py | 3 ++- tests/helpers/test_device_registry.py | 4 ++-- tests/helpers/test_entity_platform.py | 4 ++-- 24 files changed, 50 insertions(+), 31 deletions(-) diff --git a/homeassistant/components/climacell/__init__.py b/homeassistant/components/climacell/__init__.py index c6a40b839f2..bd22e8f92aa 100644 --- a/homeassistant/components/climacell/__init__.py +++ b/homeassistant/components/climacell/__init__.py @@ -27,6 +27,7 @@ from homeassistant.const import ( ) from homeassistant.core import HomeAssistant from homeassistant.helpers.aiohttp_client import async_get_clientsession +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.update_coordinator import ( CoordinatorEntity, @@ -358,7 +359,7 @@ class ClimaCellEntity(CoordinatorEntity): def device_info(self) -> DeviceInfo: """Return device registry information.""" return DeviceInfo( - entry_type="service", + entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, self._config_entry.data[CONF_API_KEY])}, manufacturer="ClimaCell", name="ClimaCell", diff --git a/homeassistant/components/coinbase/sensor.py b/homeassistant/components/coinbase/sensor.py index 817a99d9eb1..f2d450463f2 100644 --- a/homeassistant/components/coinbase/sensor.py +++ b/homeassistant/components/coinbase/sensor.py @@ -7,6 +7,7 @@ from homeassistant.components.sensor import ( SensorEntity, ) from homeassistant.const import ATTR_ATTRIBUTION +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.entity import DeviceInfo from .const import ( @@ -112,7 +113,7 @@ class AccountSensor(SensorEntity): self._attr_state_class = STATE_CLASS_TOTAL self._attr_device_info = DeviceInfo( configuration_url="https://www.coinbase.com/settings/api", - entry_type="service", + entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, self._coinbase_data.user_id)}, manufacturer="Coinbase.com", name=f"Coinbase {self._coinbase_data.user_id[-4:]}", @@ -185,7 +186,7 @@ class ExchangeRateSensor(SensorEntity): self._attr_state_class = STATE_CLASS_MEASUREMENT self._attr_device_info = DeviceInfo( configuration_url="https://www.coinbase.com/settings/api", - entry_type="service", + entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, self._coinbase_data.user_id)}, manufacturer="Coinbase.com", name=f"Coinbase {self._coinbase_data.user_id[-4:]}", diff --git a/homeassistant/components/deconz/gateway.py b/homeassistant/components/deconz/gateway.py index 679c1498e44..8742cd087d4 100644 --- a/homeassistant/components/deconz/gateway.py +++ b/homeassistant/components/deconz/gateway.py @@ -156,7 +156,7 @@ class DeconzGateway: device_registry.async_get_or_create( config_entry_id=self.config_entry.entry_id, configuration_url=configuration_url, - entry_type="service", + entry_type=dr.DeviceEntryType.SERVICE, identifiers={(DECONZ_DOMAIN, self.api.config.bridge_id)}, manufacturer="Dresden Elektronik", model=self.api.config.model_id, diff --git a/homeassistant/components/eafm/sensor.py b/homeassistant/components/eafm/sensor.py index e5edf8e0b99..40059f71f1a 100644 --- a/homeassistant/components/eafm/sensor.py +++ b/homeassistant/components/eafm/sensor.py @@ -8,6 +8,7 @@ import async_timeout from homeassistant.components.sensor import SensorEntity from homeassistant.const import ATTR_ATTRIBUTION, LENGTH_METERS from homeassistant.helpers.aiohttp_client import async_get_clientsession +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.update_coordinator import ( CoordinatorEntity, @@ -123,7 +124,7 @@ class Measurement(CoordinatorEntity, SensorEntity): def device_info(self): """Return the device info.""" return DeviceInfo( - entry_type="service", + entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, "measure-id", self.station_id)}, manufacturer="https://environment.data.gov.uk/", model=self.parameter_name, diff --git a/homeassistant/components/hassio/__init__.py b/homeassistant/components/hassio/__init__.py index e05491b5ae1..6b61881b47b 100644 --- a/homeassistant/components/hassio/__init__.py +++ b/homeassistant/components/hassio/__init__.py @@ -19,7 +19,6 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( ATTR_MANUFACTURER, ATTR_NAME, - ATTR_SERVICE, EVENT_CORE_CONFIG_UPDATE, SERVICE_HOMEASSISTANT_RESTART, SERVICE_HOMEASSISTANT_STOP, @@ -27,7 +26,11 @@ from homeassistant.const import ( from homeassistant.core import DOMAIN as HASS_DOMAIN, HomeAssistant, callback from homeassistant.exceptions import HomeAssistantError from homeassistant.helpers import config_validation as cv, recorder -from homeassistant.helpers.device_registry import DeviceRegistry, async_get_registry +from homeassistant.helpers.device_registry import ( + DeviceEntryType, + DeviceRegistry, + async_get_registry, +) from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.typing import ConfigType from homeassistant.helpers.update_coordinator import DataUpdateCoordinator @@ -660,7 +663,7 @@ def async_register_addons_in_dev_reg( model=SupervisorEntityModel.ADDON, sw_version=addon[ATTR_VERSION], name=addon[ATTR_NAME], - entry_type=ATTR_SERVICE, + entry_type=DeviceEntryType.SERVICE, configuration_url=f"homeassistant://hassio/addon/{addon[ATTR_SLUG]}", ) if manufacturer := addon.get(ATTR_REPOSITORY) or addon.get(ATTR_URL): @@ -679,7 +682,7 @@ def async_register_os_in_dev_reg( model=SupervisorEntityModel.OS, sw_version=os_dict[ATTR_VERSION], name="Home Assistant Operating System", - entry_type=ATTR_SERVICE, + entry_type=DeviceEntryType.SERVICE, ) dev_reg.async_get_or_create(config_entry_id=entry_id, **params) diff --git a/homeassistant/components/homekit/__init__.py b/homeassistant/components/homekit/__init__.py index 050f0b3db12..b372a863532 100644 --- a/homeassistant/components/homekit/__init__.py +++ b/homeassistant/components/homekit/__init__.py @@ -766,7 +766,7 @@ class HomeKit: manufacturer=MANUFACTURER, name=accessory_friendly_name(self._entry_title, self.driver.accessory), model=f"HomeKit {hk_mode_name}", - entry_type="service", + entry_type=device_registry.DeviceEntryType.SERVICE, ) @callback diff --git a/homeassistant/components/met_eireann/weather.py b/homeassistant/components/met_eireann/weather.py index ddd39d82c3b..51bfa5b360a 100644 --- a/homeassistant/components/met_eireann/weather.py +++ b/homeassistant/components/met_eireann/weather.py @@ -20,6 +20,7 @@ from homeassistant.const import ( SPEED_MILES_PER_HOUR, TEMP_CELSIUS, ) +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.update_coordinator import CoordinatorEntity from homeassistant.util import dt as dt_util @@ -187,7 +188,7 @@ class MetEireannWeather(CoordinatorEntity, WeatherEntity): """Device info.""" return DeviceInfo( default_name="Forecast", - entry_type="service", + entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN,)}, manufacturer="Met Éireann", model="Forecast", diff --git a/homeassistant/components/meteo_france/sensor.py b/homeassistant/components/meteo_france/sensor.py index 3cbd56bf94e..ac1ccc13009 100644 --- a/homeassistant/components/meteo_france/sensor.py +++ b/homeassistant/components/meteo_france/sensor.py @@ -8,6 +8,7 @@ from homeassistant.components.sensor import SensorEntity from homeassistant.config_entries import ConfigEntry from homeassistant.const import ATTR_ATTRIBUTION from homeassistant.core import HomeAssistant +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.update_coordinator import ( CoordinatorEntity, @@ -96,7 +97,7 @@ class MeteoFranceSensor(CoordinatorEntity, SensorEntity): def device_info(self) -> DeviceInfo: """Return the device info.""" return DeviceInfo( - entry_type="service", + entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, self.platform.config_entry.unique_id)}, manufacturer=MANUFACTURER, model=MODEL, diff --git a/homeassistant/components/meteo_france/weather.py b/homeassistant/components/meteo_france/weather.py index 5892944cf6a..8158d6564cf 100644 --- a/homeassistant/components/meteo_france/weather.py +++ b/homeassistant/components/meteo_france/weather.py @@ -15,6 +15,7 @@ from homeassistant.components.weather import ( from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_MODE, TEMP_CELSIUS from homeassistant.core import HomeAssistant +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.update_coordinator import ( CoordinatorEntity, @@ -90,7 +91,7 @@ class MeteoFranceWeather(CoordinatorEntity, WeatherEntity): def device_info(self) -> DeviceInfo: """Return the device info.""" return DeviceInfo( - entry_type="service", + entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, self.platform.config_entry.unique_id)}, manufacturer=MANUFACTURER, model=MODEL, diff --git a/homeassistant/components/meteoclimatic/sensor.py b/homeassistant/components/meteoclimatic/sensor.py index 8e4e9f8fe13..603940b4cc8 100644 --- a/homeassistant/components/meteoclimatic/sensor.py +++ b/homeassistant/components/meteoclimatic/sensor.py @@ -3,6 +3,7 @@ from homeassistant.components.sensor import SensorEntity, SensorEntityDescriptio from homeassistant.config_entries import ConfigEntry from homeassistant.const import ATTR_ATTRIBUTION from homeassistant.core import HomeAssistant +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.update_coordinator import ( CoordinatorEntity, @@ -43,7 +44,7 @@ class MeteoclimaticSensor(CoordinatorEntity, SensorEntity): def device_info(self): """Return the device info.""" return DeviceInfo( - entry_type="service", + entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, self.platform.config_entry.unique_id)}, manufacturer=MANUFACTURER, model=MODEL, diff --git a/homeassistant/components/meteoclimatic/weather.py b/homeassistant/components/meteoclimatic/weather.py index 36c3229777f..4faecdaa3ac 100644 --- a/homeassistant/components/meteoclimatic/weather.py +++ b/homeassistant/components/meteoclimatic/weather.py @@ -5,6 +5,7 @@ from homeassistant.components.weather import WeatherEntity from homeassistant.config_entries import ConfigEntry from homeassistant.const import TEMP_CELSIUS from homeassistant.core import HomeAssistant +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.update_coordinator import ( @@ -57,7 +58,7 @@ class MeteoclimaticWeather(CoordinatorEntity, WeatherEntity): def device_info(self): """Return the device info.""" return DeviceInfo( - entry_type="service", + entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, self.platform.config_entry.unique_id)}, manufacturer=MANUFACTURER, model=MODEL, diff --git a/homeassistant/components/nightscout/__init__.py b/homeassistant/components/nightscout/__init__.py index 6bf1a7f1929..28906ce6e88 100644 --- a/homeassistant/components/nightscout/__init__.py +++ b/homeassistant/components/nightscout/__init__.py @@ -39,7 +39,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: manufacturer="Nightscout Foundation", name=status.name, sw_version=status.version, - entry_type="service", + entry_type=dr.DeviceEntryType.SERVICE, ) hass.config_entries.async_setup_platforms(entry, PLATFORMS) diff --git a/homeassistant/components/nws/__init__.py b/homeassistant/components/nws/__init__.py index 6f5bdd145c9..02327336035 100644 --- a/homeassistant/components/nws/__init__.py +++ b/homeassistant/components/nws/__init__.py @@ -12,6 +12,7 @@ from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE from homeassistant.core import HomeAssistant, callback from homeassistant.helpers import debounce from homeassistant.helpers.aiohttp_client import async_get_clientsession +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.event import async_track_point_in_utc_time from homeassistant.helpers.update_coordinator import DataUpdateCoordinator @@ -172,7 +173,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: def device_info(latitude, longitude) -> DeviceInfo: """Return device registry information.""" return DeviceInfo( - entry_type="service", + entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, base_unique_id(latitude, longitude))}, manufacturer="National Weather Service", name=f"NWS: {latitude}, {longitude}", diff --git a/homeassistant/components/ovo_energy/__init__.py b/homeassistant/components/ovo_energy/__init__.py index cb3fba80378..2b69ca0ade7 100644 --- a/homeassistant/components/ovo_energy/__init__.py +++ b/homeassistant/components/ovo_energy/__init__.py @@ -13,6 +13,7 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.typing import ConfigType from homeassistant.helpers.update_coordinator import ( @@ -112,7 +113,7 @@ class OVOEnergyDeviceEntity(OVOEnergyEntity): def device_info(self) -> DeviceInfo: """Return device information about this OVO Energy instance.""" return DeviceInfo( - entry_type="service", + entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, self._client.account_id)}, manufacturer="OVO Energy", name=self._client.username, diff --git a/homeassistant/components/plex/media_player.py b/homeassistant/components/plex/media_player.py index 3bc0a080f8c..6a48a427519 100644 --- a/homeassistant/components/plex/media_player.py +++ b/homeassistant/components/plex/media_player.py @@ -23,6 +23,7 @@ from homeassistant.components.media_player.const import ( from homeassistant.const import STATE_IDLE, STATE_PAUSED, STATE_PLAYING from homeassistant.core import callback from homeassistant.exceptions import HomeAssistantError +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.dispatcher import ( async_dispatcher_connect, async_dispatcher_send, @@ -533,7 +534,7 @@ class PlexMediaPlayer(MediaPlayerEntity): name="Plex Client Service", manufacturer="Plex", model="Plex Clients", - entry_type="service", + entry_type=DeviceEntryType.SERVICE, ) return DeviceInfo( diff --git a/homeassistant/components/spotify/media_player.py b/homeassistant/components/spotify/media_player.py index 029f7dc9e8b..efb5e0f6b4a 100644 --- a/homeassistant/components/spotify/media_player.py +++ b/homeassistant/components/spotify/media_player.py @@ -53,6 +53,7 @@ from homeassistant.const import ( from homeassistant.core import HomeAssistant from homeassistant.exceptions import HomeAssistantError from homeassistant.helpers.config_entry_oauth2_flow import OAuth2Session +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.util.dt import utc_from_timestamp @@ -267,7 +268,7 @@ class SpotifyMediaPlayer(MediaPlayerEntity): manufacturer="Spotify AB", model=model, name=self._name, - entry_type="service", + entry_type=DeviceEntryType.SERVICE, configuration_url="https://open.spotify.com", ) diff --git a/homeassistant/components/unifi/switch.py b/homeassistant/components/unifi/switch.py index 3c002642564..370d48d5adf 100644 --- a/homeassistant/components/unifi/switch.py +++ b/homeassistant/components/unifi/switch.py @@ -17,6 +17,7 @@ from aiounifi.events import ( from homeassistant.components.switch import DOMAIN, SwitchEntity from homeassistant.const import ENTITY_CATEGORY_CONFIG from homeassistant.core import callback +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.entity_registry import async_entries_for_config_entry @@ -370,7 +371,7 @@ class UniFiDPIRestrictionSwitch(UniFiBase, SwitchEntity): def device_info(self) -> DeviceInfo: """Return a service description for device registry.""" return DeviceInfo( - entry_type="service", + entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, f"unifi_controller_{self._item.site_id}")}, manufacturer=ATTR_MANUFACTURER, model="UniFi Controller", diff --git a/homeassistant/components/xbox/base_sensor.py b/homeassistant/components/xbox/base_sensor.py index 8ef0928f903..100685b6c34 100644 --- a/homeassistant/components/xbox/base_sensor.py +++ b/homeassistant/components/xbox/base_sensor.py @@ -3,6 +3,7 @@ from __future__ import annotations from yarl import URL +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.helpers.entity import DeviceInfo from homeassistant.helpers.update_coordinator import CoordinatorEntity @@ -70,7 +71,7 @@ class XboxBaseSensorEntity(CoordinatorEntity): def device_info(self) -> DeviceInfo: """Return a device description for device registry.""" return DeviceInfo( - entry_type="service", + entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, "xbox_live")}, manufacturer="Microsoft", model="Xbox Live", diff --git a/tests/components/config/test_device_registry.py b/tests/components/config/test_device_registry.py index 0d9170f0a83..edc167405ac 100644 --- a/tests/components/config/test_device_registry.py +++ b/tests/components/config/test_device_registry.py @@ -36,7 +36,7 @@ async def test_list_devices(hass, client, registry): manufacturer="manufacturer", model="model", via_device=("bridgeid", "0123"), - entry_type="service", + entry_type=helpers_dr.DeviceEntryType.SERVICE, ) await client.send_json({"id": 5, "type": "config/device_registry/list"}) @@ -68,7 +68,7 @@ async def test_list_devices(hass, client, registry): "model": "model", "name": None, "sw_version": None, - "entry_type": "service", + "entry_type": helpers_dr.DeviceEntryType.SERVICE, "via_device_id": dev1, "area_id": None, "name_by_user": None, diff --git a/tests/components/deconz/test_gateway.py b/tests/components/deconz/test_gateway.py index 8016d2327ef..9457c2e988b 100644 --- a/tests/components/deconz/test_gateway.py +++ b/tests/components/deconz/test_gateway.py @@ -176,7 +176,7 @@ async def test_gateway_setup(hass, aioclient_mock): ) assert gateway_entry.configuration_url == f"http://{HOST}:{PORT}" - assert gateway_entry.entry_type == "service" + assert gateway_entry.entry_type is dr.DeviceEntryType.SERVICE async def test_gateway_device_configuration_url_when_addon(hass, aioclient_mock): diff --git a/tests/components/kraken/test_sensor.py b/tests/components/kraken/test_sensor.py index ca98251f157..bc37b67e676 100644 --- a/tests/components/kraken/test_sensor.py +++ b/tests/components/kraken/test_sensor.py @@ -11,6 +11,7 @@ from homeassistant.components.kraken.const import ( DOMAIN, ) from homeassistant.const import CONF_SCAN_INTERVAL, EVENT_HOMEASSISTANT_START +from homeassistant.helpers.device_registry import DeviceEntryType import homeassistant.util.dt as dt_util from .const import ( @@ -253,7 +254,7 @@ async def test_sensors_available_after_restart(hass): identifiers={(DOMAIN, "XBT_USD")}, name="XBT USD", manufacturer="Kraken.com", - entry_type="service", + entry_type=DeviceEntryType.SERVICE, ) entry.add_to_hass(hass) diff --git a/tests/components/picnic/test_sensor.py b/tests/components/picnic/test_sensor.py index 4edf2c3ec98..b0d12f1f080 100644 --- a/tests/components/picnic/test_sensor.py +++ b/tests/components/picnic/test_sensor.py @@ -16,6 +16,7 @@ from homeassistant.const import ( DEVICE_CLASS_TIMESTAMP, STATE_UNAVAILABLE, ) +from homeassistant.helpers.device_registry import DeviceEntryType from homeassistant.util import dt from tests.common import ( @@ -390,7 +391,7 @@ class TestPicnicSensor(unittest.IsolatedAsyncioTestCase): ) assert picnic_service.model == DEFAULT_USER_RESPONSE["user_id"] assert picnic_service.name == "Picnic: Commonstreet 123a" - assert picnic_service.entry_type == "service" + assert picnic_service.entry_type is DeviceEntryType.SERVICE async def test_auth_token_is_saved_on_update(self): """Test that auth-token changes in the session object are reflected by the config entry.""" diff --git a/tests/helpers/test_device_registry.py b/tests/helpers/test_device_registry.py index 939387f411a..5d3736fd060 100644 --- a/tests/helpers/test_device_registry.py +++ b/tests/helpers/test_device_registry.py @@ -179,7 +179,7 @@ async def test_loading_from_storage(hass, hass_storage): "model": "model", "name": "name", "sw_version": "version", - "entry_type": "service", + "entry_type": device_registry.DeviceEntryType.SERVICE, "area_id": "12345A", "name_by_user": "Test Friendly Name", "disabled_by": device_registry.DISABLED_USER, @@ -212,7 +212,7 @@ async def test_loading_from_storage(hass, hass_storage): assert entry.id == "abcdefghijklm" assert entry.area_id == "12345A" assert entry.name_by_user == "Test Friendly Name" - assert entry.entry_type == "service" + assert entry.entry_type is device_registry.DeviceEntryType.SERVICE assert entry.disabled_by == device_registry.DISABLED_USER assert isinstance(entry.config_entries, set) assert isinstance(entry.connections, set) diff --git a/tests/helpers/test_entity_platform.py b/tests/helpers/test_entity_platform.py index 8573e90f592..11cbc78ed71 100644 --- a/tests/helpers/test_entity_platform.py +++ b/tests/helpers/test_entity_platform.py @@ -839,7 +839,7 @@ async def test_device_info_called(hass): "name": "test-name", "sw_version": "test-sw", "suggested_area": "Heliport", - "entry_type": "service", + "entry_type": dr.DeviceEntryType.SERVICE, "via_device": ("hue", "via-id"), }, ), @@ -863,7 +863,7 @@ async def test_device_info_called(hass): assert device.identifiers == {("hue", "1234")} assert device.configuration_url == "http://192.168.0.100/config" assert device.connections == {(dr.CONNECTION_NETWORK_MAC, "abcd")} - assert device.entry_type == "service" + assert device.entry_type is dr.DeviceEntryType.SERVICE assert device.manufacturer == "test-manuf" assert device.model == "test-model" assert device.name == "test-name"