Add more robustness to checking values

PeteRager · Oct 7, 2023 · fc9064f · fc9064f
1 parent 26c6322
commit fc9064f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/custom_components/lennoxs30/sensor_wt_env.py b/custom_components/lennoxs30/sensor_wt_env.py
@@ -215,11 +215,10 @@ def native_unit_of_measurement(self):
     @property
     def available(self) -> bool:
         attr_val = getattr(self._system, self._system_attr)
-        if attr_val is None:
+        if attr_val is None or attr_val == self._unavailable_value:
             return False
-        if getattr(self._system, self._system_attr) == self._unavailable_value:
-            return False
-        if getattr(self._system, self._availability_attribute) is False:
+        attr_avail = getattr(self._system, self._availability_attribute)
+        if attr_avail is None or attr_avail is False:
             return False
         return super().available
 

diff --git a/tests/test_sensor_wt_env.py b/tests/test_sensor_wt_env.py
@@ -73,6 +73,10 @@ async def test_wt_env_sensor_humidity(hass, manager_system_04_furn_ac_zoning_ble
     assert sensor.available is False
     assert sensor.native_value is None
 
+    system.wt_env_humidity = "not an integer"
+    assert sensor.native_value is None
+    assert sensor.available is False
+
     data = loadfile("weather.json", system.sysId)
     manager.api.processMessage(data)