feedc0de/homeassistant-core
1
0
Fork 0
forked from home-assistant/core
Code Pull Requests Activity

Fix unique_id conflict in smarttthings (#55235)

Browse Source
This commit is contained in:
Chris
2021-08-26 13:43:26 -07:00
committed by GitHub
parent c3972b22fd
commit 14aa19b814
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/smartthings/sensor.py
View File

@@ -561,7 +561,7 @@ class SmartThingsPowerConsumptionSensor(SmartThingsEntity, SensorEntity):
@property @property
def unique_id(self) -> str: def unique_id(self) -> str:
"""Return a unique ID.""" """Return a unique ID."""
return f"{self._device.device_id}.{self.report_name}" return f"{self._device.device_id}.{self.report_name}_meter"
@property @property
def native_value(self): def native_value(self):

6
tests/components/smartthings/test_sensor.py
View File

@@ -168,7 +168,7 @@ async def test_power_consumption_sensor(hass, device_factory):
assert state.state == "1412.002" assert state.state == "1412.002"
entry = entity_registry.async_get("sensor.refrigerator_energy") entry = entity_registry.async_get("sensor.refrigerator_energy")
assert entry assert entry
assert entry.unique_id == f"{device.device_id}.energy" assert entry.unique_id == f"{device.device_id}.energy_meter"
entry = device_registry.async_get_device({(DOMAIN, device.device_id)}) entry = device_registry.async_get_device({(DOMAIN, device.device_id)})
assert entry assert entry
assert entry.name == device.label assert entry.name == device.label
@@ -180,7 +180,7 @@ async def test_power_consumption_sensor(hass, device_factory):
assert state.state == "109" assert state.state == "109"
entry = entity_registry.async_get("sensor.refrigerator_power") entry = entity_registry.async_get("sensor.refrigerator_power")
assert entry assert entry
assert entry.unique_id == f"{device.device_id}.power" assert entry.unique_id == f"{device.device_id}.power_meter"
entry = device_registry.async_get_device({(DOMAIN, device.device_id)}) entry = device_registry.async_get_device({(DOMAIN, device.device_id)})
assert entry assert entry
assert entry.name == device.label assert entry.name == device.label
@@ -202,7 +202,7 @@ async def test_power_consumption_sensor(hass, device_factory):
assert state.state == "unknown" assert state.state == "unknown"
entry = entity_registry.async_get("sensor.vacuum_energy") entry = entity_registry.async_get("sensor.vacuum_energy")
assert entry assert entry
assert entry.unique_id == f"{device.device_id}.energy" assert entry.unique_id == f"{device.device_id}.energy_meter"
entry = device_registry.async_get_device({(DOMAIN, device.device_id)}) entry = device_registry.async_get_device({(DOMAIN, device.device_id)})
assert entry assert entry
assert entry.name == device.label assert entry.name == device.label