From d883ee62f8b216e30898f843fff423ef0364cee4 Mon Sep 17 00:00:00 2001 From: Robert Svensson Date: Fri, 10 Jan 2020 19:57:08 +0100 Subject: [PATCH] deCONZ - Disable daylight sensor by default (#30625) * Dont enable daylight sensor by default * Fix tests --- homeassistant/components/deconz/deconz_device.py | 8 +++++++- tests/components/deconz/test_sensor.py | 12 ++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/homeassistant/components/deconz/deconz_device.py b/homeassistant/components/deconz/deconz_device.py index 68daee6cf26..a9a1e2cdb1f 100644 --- a/homeassistant/components/deconz/deconz_device.py +++ b/homeassistant/components/deconz/deconz_device.py @@ -59,7 +59,10 @@ class DeconzDevice(DeconzBase, Entity): @property def entity_registry_enabled_default(self): - """Return if the entity should be enabled when first added to the entity registry.""" + """Return if the entity should be enabled when first added to the entity registry. + + Daylight is a virtual sensor from deCONZ that should never be enabled by default. + """ if not self.gateway.option_allow_clip_sensor and self._device.type.startswith( "CLIP" ): @@ -71,6 +74,9 @@ class DeconzDevice(DeconzBase, Entity): ): return False + if self._device.type == "Daylight": + return False + return True async def async_added_to_hass(self): diff --git a/tests/components/deconz/test_sensor.py b/tests/components/deconz/test_sensor.py index 533aaddf4eb..2229031fa90 100644 --- a/tests/components/deconz/test_sensor.py +++ b/tests/components/deconz/test_sensor.py @@ -104,11 +104,11 @@ async def test_sensors(hass): assert "sensor.switch_1_battery_level" not in gateway.deconz_ids assert "sensor.switch_2" not in gateway.deconz_ids assert "sensor.switch_2_battery_level" in gateway.deconz_ids - assert "sensor.daylight_sensor" in gateway.deconz_ids + assert "sensor.daylight_sensor" not in gateway.deconz_ids assert "sensor.power_sensor" in gateway.deconz_ids assert "sensor.consumption_sensor" in gateway.deconz_ids assert "sensor.clip_light_level_sensor" not in gateway.deconz_ids - assert len(hass.states.async_all()) == 6 + assert len(hass.states.async_all()) == 5 light_level_sensor = hass.states.get("sensor.light_level_sensor") assert light_level_sensor.state == "999.8" @@ -129,7 +129,7 @@ async def test_sensors(hass): assert switch_2_battery_level.state == "100" daylight_sensor = hass.states.get("sensor.daylight_sensor") - assert daylight_sensor.state == "dawn" + assert daylight_sensor is None power_sensor = hass.states.get("sensor.power_sensor") assert power_sensor.state == "6" @@ -182,11 +182,11 @@ async def test_allow_clip_sensors(hass): assert "sensor.switch_1_battery_level" not in gateway.deconz_ids assert "sensor.switch_2" not in gateway.deconz_ids assert "sensor.switch_2_battery_level" in gateway.deconz_ids - assert "sensor.daylight_sensor" in gateway.deconz_ids + assert "sensor.daylight_sensor" not in gateway.deconz_ids assert "sensor.power_sensor" in gateway.deconz_ids assert "sensor.consumption_sensor" in gateway.deconz_ids assert "sensor.clip_light_level_sensor" in gateway.deconz_ids - assert len(hass.states.async_all()) == 7 + assert len(hass.states.async_all()) == 6 light_level_sensor = hass.states.get("sensor.light_level_sensor") assert light_level_sensor.state == "999.8" @@ -207,7 +207,7 @@ async def test_allow_clip_sensors(hass): assert switch_2_battery_level.state == "100" daylight_sensor = hass.states.get("sensor.daylight_sensor") - assert daylight_sensor.state == "dawn" + assert daylight_sensor is None power_sensor = hass.states.get("sensor.power_sensor") assert power_sensor.state == "6"