From b8460bb331cc0b1af73d9e3a8e412bc2c3f842ad Mon Sep 17 00:00:00 2001
From: Andrew Sayre <6730289+andrewsayre@users.noreply.github.com>
Date: Sat, 10 Aug 2019 23:47:36 -0500
Subject: [PATCH] Always populate hvac_modes in SmartThings climate platform
 (#25859)

* Always return list for hvac_modes

* Use climate constants
---
 .../components/smartthings/climate.py         | 13 +++++-----
 tests/components/smartthings/test_climate.py  | 25 ++++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/homeassistant/components/smartthings/climate.py b/homeassistant/components/smartthings/climate.py
index e9fefeb2995..bb307523e97 100644
--- a/homeassistant/components/smartthings/climate.py
+++ b/homeassistant/components/smartthings/climate.py
@@ -228,35 +228,34 @@ class SmartThingsThermostat(SmartThingsEntity, ClimateDevice):
         self._hvac_mode = MODE_TO_STATE.get(thermostat_mode)
         if self._hvac_mode is None:
             _LOGGER.debug(
-                "Device %s (%s) returned an invalid" "hvac mode: %s",
+                "Device %s (%s) returned an invalid hvac mode: %s",
                 self._device.label,
                 self._device.device_id,
                 thermostat_mode,
             )
 
+        modes = set()
         supported_modes = self._device.status.supported_thermostat_modes
         if isinstance(supported_modes, Iterable):
-            operations = set()
             for mode in supported_modes:
                 state = MODE_TO_STATE.get(mode)
                 if state is not None:
-                    operations.add(state)
+                    modes.add(state)
                 else:
                     _LOGGER.debug(
-                        "Device %s (%s) returned an invalid "
-                        "supported thermostat mode: %s",
+                        "Device %s (%s) returned an invalid supported thermostat mode: %s",
                         self._device.label,
                         self._device.device_id,
                         mode,
                     )
-            self._hvac_modes = operations
         else:
             _LOGGER.debug(
-                "Device %s (%s) returned invalid supported " "thermostat modes: %s",
+                "Device %s (%s) returned invalid supported thermostat modes: %s",
                 self._device.label,
                 self._device.device_id,
                 supported_modes,
             )
+        self._hvac_modes = list(modes)
 
     @property
     def current_humidity(self):
diff --git a/tests/components/smartthings/test_climate.py b/tests/components/smartthings/test_climate.py
index 01206ded062..c366761ea1f 100644
--- a/tests/components/smartthings/test_climate.py
+++ b/tests/components/smartthings/test_climate.py
@@ -214,14 +214,14 @@ async def test_legacy_thermostat_entity_state(hass, legacy_thermostat):
         | SUPPORT_TARGET_TEMPERATURE_RANGE
         | SUPPORT_TARGET_TEMPERATURE
     )
-    assert state.attributes[ATTR_HVAC_ACTIONS] == "idle"
-    assert state.attributes[ATTR_HVAC_MODES] == {
+    assert state.attributes[ATTR_HVAC_ACTIONS] == CURRENT_HVAC_IDLE
+    assert sorted(state.attributes[ATTR_HVAC_MODES]) == [
         HVAC_MODE_AUTO,
         HVAC_MODE_COOL,
-        HVAC_MODE_HEAT_COOL,
         HVAC_MODE_HEAT,
+        HVAC_MODE_HEAT_COOL,
         HVAC_MODE_OFF,
-    }
+    ]
     assert state.attributes[ATTR_FAN_MODE] == "auto"
     assert state.attributes[ATTR_FAN_MODES] == ["auto", "on"]
     assert state.attributes[ATTR_TARGET_TEMP_LOW] == 20  # celsius
@@ -239,12 +239,12 @@ async def test_basic_thermostat_entity_state(hass, basic_thermostat):
         == SUPPORT_TARGET_TEMPERATURE_RANGE | SUPPORT_TARGET_TEMPERATURE
     )
     assert ATTR_HVAC_ACTIONS not in state.attributes
-    assert state.attributes[ATTR_HVAC_MODES] == {
-        HVAC_MODE_OFF,
-        HVAC_MODE_HEAT_COOL,
-        HVAC_MODE_HEAT,
+    assert sorted(state.attributes[ATTR_HVAC_MODES]) == [
         HVAC_MODE_COOL,
-    }
+        HVAC_MODE_HEAT,
+        HVAC_MODE_HEAT_COOL,
+        HVAC_MODE_OFF,
+    ]
     assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 21.1  # celsius
 
 
@@ -260,13 +260,13 @@ async def test_thermostat_entity_state(hass, thermostat):
         | SUPPORT_TARGET_TEMPERATURE
     )
     assert state.attributes[ATTR_HVAC_ACTIONS] == CURRENT_HVAC_IDLE
-    assert state.attributes[ATTR_HVAC_MODES] == {
+    assert sorted(state.attributes[ATTR_HVAC_MODES]) == [
         HVAC_MODE_AUTO,
         HVAC_MODE_COOL,
         HVAC_MODE_HEAT,
         HVAC_MODE_HEAT_COOL,
         HVAC_MODE_OFF,
-    }
+    ]
     assert state.attributes[ATTR_FAN_MODE] == "on"
     assert state.attributes[ATTR_FAN_MODES] == ["auto", "on"]
     assert state.attributes[ATTR_TEMPERATURE] == 20  # celsius
@@ -286,6 +286,7 @@ async def test_buggy_thermostat_entity_state(hass, buggy_thermostat):
     assert state.state is STATE_UNKNOWN
     assert state.attributes[ATTR_TEMPERATURE] is None
     assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 21.1  # celsius
+    assert state.attributes[ATTR_HVAC_MODES] == []
 
 
 async def test_buggy_thermostat_invalid_mode(hass, buggy_thermostat):
@@ -295,7 +296,7 @@ async def test_buggy_thermostat_invalid_mode(hass, buggy_thermostat):
     )
     await setup_platform(hass, CLIMATE_DOMAIN, devices=[buggy_thermostat])
     state = hass.states.get("climate.buggy_thermostat")
-    assert state.attributes[ATTR_HVAC_MODES] == {"heat"}
+    assert state.attributes[ATTR_HVAC_MODES] == [HVAC_MODE_HEAT]
 
 
 async def test_air_conditioner_entity_state(hass, air_conditioner):