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

deCONZ - Disable daylight sensor by default (#30625)

Browse source 
* Dont enable daylight sensor by default

* Fix tests
This commit is contained in:
Robert Svensson 2020-01-10 19:57:08 +01:00 • committed by Paulus Schoutsen
parent c13b461737
commit d883ee62f8
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
homeassistant/components/deconz/deconz_device.py
View file

@ -59,7 +59,10 @@ class DeconzDevice(DeconzBase, Entity):
@property @property
def entity_registry_enabled_default(self): 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( if not self.gateway.option_allow_clip_sensor and self._device.type.startswith(
"CLIP" "CLIP"
): ):
@ -71,6 +74,9 @@ class DeconzDevice(DeconzBase, Entity):
): ):
return False return False
if self._device.type == "Daylight":
return False
return True return True
async def async_added_to_hass(self): async def async_added_to_hass(self):

12
tests/components/deconz/test_sensor.py
View file

@ -104,11 +104,11 @@ async def test_sensors(hass):
assert "sensor.switch_1_battery_level" not in gateway.deconz_ids assert "sensor.switch_1_battery_level" not in gateway.deconz_ids
assert "sensor.switch_2" 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.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.power_sensor" in gateway.deconz_ids
assert "sensor.consumption_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 "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") light_level_sensor = hass.states.get("sensor.light_level_sensor")
assert light_level_sensor.state == "999.8" assert light_level_sensor.state == "999.8"
@ -129,7 +129,7 @@ async def test_sensors(hass):
assert switch_2_battery_level.state == "100" assert switch_2_battery_level.state == "100"
daylight_sensor = hass.states.get("sensor.daylight_sensor") 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") power_sensor = hass.states.get("sensor.power_sensor")
assert power_sensor.state == "6" 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_1_battery_level" not in gateway.deconz_ids
assert "sensor.switch_2" 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.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.power_sensor" in gateway.deconz_ids
assert "sensor.consumption_sensor" in gateway.deconz_ids assert "sensor.consumption_sensor" in gateway.deconz_ids
assert "sensor.clip_light_level_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") light_level_sensor = hass.states.get("sensor.light_level_sensor")
assert light_level_sensor.state == "999.8" 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" assert switch_2_battery_level.state == "100"
daylight_sensor = hass.states.get("sensor.daylight_sensor") 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") power_sensor = hass.states.get("sensor.power_sensor")
assert power_sensor.state == "6" assert power_sensor.state == "6"