Fix availability for GIOS index sensors

homeassistant/components/gios/sensor.py

@@ -230,11 +230,11 @@ def native_value(self) -> StateType:
     @property
     def available(self) -> bool:
         """Return if entity is available."""
-        available = super().available
         sensor_data = getattr(self.coordinator.data, self.entity_description.key)
+        available = super().available and bool(sensor_data)
 
         # Sometimes the API returns sensor data without indexes
-        if self.entity_description.subkey:
+        if self.entity_description.subkey and available:
             return available and bool(sensor_data.index)
 
-        return available and bool(sensor_data)
+        return available

tests/components/gios/test_sensor.py

@@ -1,5 +1,6 @@
 """Test sensor of GIOS integration."""
 
+from copy import deepcopy
 from datetime import timedelta
 import json
 from unittest.mock import patch
@@ -277,44 +278,47 @@ async def test_availability(hass: HomeAssistant) -> None:
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.home_pm2_5")
-        assert state
-        assert state.state == STATE_UNAVAILABLE
+    state = hass.states.get("sensor.home_pm2_5")
+    assert state
+    assert state.state == STATE_UNAVAILABLE
 
-        state = hass.states.get("sensor.home_pm2_5_index")
-        assert state
-        assert state.state == STATE_UNAVAILABLE
+    state = hass.states.get("sensor.home_pm2_5_index")
+    assert state
+    assert state.state == STATE_UNAVAILABLE
 
-        state = hass.states.get("sensor.home_air_quality_index")
-        assert state
-        assert state.state == STATE_UNAVAILABLE
+    state = hass.states.get("sensor.home_air_quality_index")
+    assert state
+    assert state.state == STATE_UNAVAILABLE
 
+    incomplete_sensors = deepcopy(sensors)
+    incomplete_sensors["pm2.5"] = {}
     future = utcnow() + timedelta(minutes=120)
     with patch(
         "homeassistant.components.gios.Gios._get_all_sensors",
-        return_value=sensors,
+        return_value=incomplete_sensors,
     ), patch(
         "homeassistant.components.gios.Gios._get_indexes",
         return_value={},
     ):
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.home_pm2_5")
-        assert state
-        assert state.state == "4"
+    # There is no PM2.5 data so the state should be unavailable
+    state = hass.states.get("sensor.home_pm2_5")
+    assert state
+    assert state.state == STATE_UNAVAILABLE
 
-        # Indexes are empty so the state should be unavailable
-        state = hass.states.get("sensor.home_air_quality_index")
-        assert state
-        assert state.state == STATE_UNAVAILABLE
+    # Indexes are empty so the state should be unavailable
+    state = hass.states.get("sensor.home_air_quality_index")
+    assert state
+    assert state.state == STATE_UNAVAILABLE
 
-        # Indexes are empty so the state should be unavailable
-        state = hass.states.get("sensor.home_pm2_5_index")
-        assert state
-        assert state.state == STATE_UNAVAILABLE
+    # Indexes are empty so the state should be unavailable
+    state = hass.states.get("sensor.home_pm2_5_index")
+    assert state
+    assert state.state == STATE_UNAVAILABLE
 
-        future = utcnow() + timedelta(minutes=180)
+    future = utcnow() + timedelta(minutes=180)
     with patch(
         "homeassistant.components.gios.Gios._get_all_sensors", return_value=sensors
     ), patch(
@@ -324,17 +328,17 @@ async def test_availability(hass: HomeAssistant) -> None:
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-        state = hass.states.get("sensor.home_pm2_5")
-        assert state
-        assert state.state == "4"
+    state = hass.states.get("sensor.home_pm2_5")
+    assert state
+    assert state.state == "4"
 
-        state = hass.states.get("sensor.home_pm2_5_index")
-        assert state
-        assert state.state == "good"
+    state = hass.states.get("sensor.home_pm2_5_index")
+    assert state
+    assert state.state == "good"
 
-        state = hass.states.get("sensor.home_air_quality_index")
-        assert state
-        assert state.state == "good"
+    state = hass.states.get("sensor.home_air_quality_index")
+    assert state
+    assert state.state == "good"
 
 
 async def test_invalid_indexes(hass: HomeAssistant) -> None: