Remove unit_of_measurement from climate entities (#16012)
* Remove unit_of_measurement from climate base class. * Updated google_assistant component and tests to use core temp units. * Fixes * Convert Alexa component to use core temp units for climate entities. * Fix tests. * Converted prometheus component. * Remove unit_of_measurement from homekit thermostat tests. * Small fix.
This commit is contained in:
1 parent
a31501d99e
commit
ae63980152
14 files changed
+184
-224
No files matched your search
@@ -7,8 +7,8 @@ import pytest
|
||||
|
||||
from homeassistant.core import Context, callback
|
||||
from homeassistant.const import (
|
||||
TEMP_FAHRENHEIT, STATE_LOCKED, STATE_UNLOCKED,
|
||||
STATE_UNKNOWN)
|
||||
TEMP_CELSIUS, TEMP_FAHRENHEIT, STATE_LOCKED,
|
||||
STATE_UNLOCKED, STATE_UNKNOWN)
|
||||
from homeassistant.setup import async_setup_component
|
||||
from homeassistant.components import alexa
|
||||
from homeassistant.components.alexa import smart_home
|
||||
@@ -707,6 +707,7 @@ def test_unknown_sensor(hass):
|
||||
|
||||
async def test_thermostat(hass):
|
||||
"""Test thermostat discovery."""
|
||||
hass.config.units.temperature_unit = TEMP_FAHRENHEIT
|
||||
device = (
|
||||
'climate.test_thermostat',
|
||||
'cool',
|
||||
@@ -721,7 +722,6 @@ async def test_thermostat(hass):
|
||||
'operation_list': ['heat', 'cool', 'auto', 'off'],
|
||||
'min_temp': 50,
|
||||
'max_temp': 90,
|
||||
'unit_of_measurement': TEMP_FAHRENHEIT,
|
||||
}
|
||||
)
|
||||
appliance = await discovery_test(device, hass)
|
||||
@@ -838,6 +838,7 @@ async def test_thermostat(hass):
|
||||
payload={'thermostatMode': {'value': 'INVALID'}}
|
||||
)
|
||||
assert msg['event']['payload']['type'] == 'UNSUPPORTED_THERMOSTAT_MODE'
|
||||
hass.config.units.temperature_unit = TEMP_CELSIUS
|
||||
|
||||
|
||||
@asyncio.coroutine
|
||||
|
||||
@@ -9,7 +9,6 @@ import homeassistant.core as ha
|
||||
from homeassistant.core import callback, CoreState, State
|
||||
from homeassistant.setup import setup_component, async_setup_component
|
||||
from homeassistant.const import (
|
||||
ATTR_UNIT_OF_MEASUREMENT,
|
||||
SERVICE_TURN_OFF,
|
||||
SERVICE_TURN_ON,
|
||||
STATE_ON,
|
||||
@@ -141,11 +140,9 @@ class TestGenericThermostatHeaterSwitching(unittest.TestCase):
|
||||
self.assertEqual(STATE_ON,
|
||||
self.hass.states.get(heater_switch).state)
|
||||
|
||||
def _setup_sensor(self, temp, unit=TEMP_CELSIUS):
|
||||
def _setup_sensor(self, temp):
|
||||
"""Set up the test sensor."""
|
||||
self.hass.states.set(ENT_SENSOR, temp, {
|
||||
ATTR_UNIT_OF_MEASUREMENT: unit
|
||||
})
|
||||
self.hass.states.set(ENT_SENSOR, temp)
|
||||
|
||||
|
||||
class TestClimateGenericThermostat(unittest.TestCase):
|
||||
@@ -222,30 +219,15 @@ class TestClimateGenericThermostat(unittest.TestCase):
|
||||
state = self.hass.states.get(ENTITY)
|
||||
self.assertEqual(23, state.attributes.get('temperature'))
|
||||
|
||||
def test_sensor_bad_unit(self):
|
||||
"""Test sensor that have bad unit."""
|
||||
state = self.hass.states.get(ENTITY)
|
||||
temp = state.attributes.get('current_temperature')
|
||||
unit = state.attributes.get('unit_of_measurement')
|
||||
|
||||
self._setup_sensor(22.0, unit='bad_unit')
|
||||
self.hass.block_till_done()
|
||||
|
||||
state = self.hass.states.get(ENTITY)
|
||||
self.assertEqual(unit, state.attributes.get('unit_of_measurement'))
|
||||
self.assertEqual(temp, state.attributes.get('current_temperature'))
|
||||
|
||||
def test_sensor_bad_value(self):
|
||||
"""Test sensor that have None as state."""
|
||||
state = self.hass.states.get(ENTITY)
|
||||
temp = state.attributes.get('current_temperature')
|
||||
unit = state.attributes.get('unit_of_measurement')
|
||||
|
||||
self._setup_sensor(None)
|
||||
self.hass.block_till_done()
|
||||
|
||||
state = self.hass.states.get(ENTITY)
|
||||
self.assertEqual(unit, state.attributes.get('unit_of_measurement'))
|
||||
self.assertEqual(temp, state.attributes.get('current_temperature'))
|
||||
|
||||
def test_set_target_temp_heater_on(self):
|
||||
@@ -367,11 +349,9 @@ class TestClimateGenericThermostat(unittest.TestCase):
|
||||
self.assertEqual(SERVICE_TURN_ON, call.service)
|
||||
self.assertEqual(ENT_SWITCH, call.data['entity_id'])
|
||||
|
||||
def _setup_sensor(self, temp, unit=TEMP_CELSIUS):
|
||||
def _setup_sensor(self, temp):
|
||||
"""Set up the test sensor."""
|
||||
self.hass.states.set(ENT_SENSOR, temp, {
|
||||
ATTR_UNIT_OF_MEASUREMENT: unit
|
||||
})
|
||||
self.hass.states.set(ENT_SENSOR, temp)
|
||||
|
||||
def _setup_switch(self, is_on):
|
||||
"""Set up the test switch."""
|
||||
@@ -532,11 +512,9 @@ class TestClimateGenericThermostatACMode(unittest.TestCase):
|
||||
self.hass.block_till_done()
|
||||
self.assertEqual(0, len(self.calls))
|
||||
|
||||
def _setup_sensor(self, temp, unit=TEMP_CELSIUS):
|
||||
def _setup_sensor(self, temp):
|
||||
"""Set up the test sensor."""
|
||||
self.hass.states.set(ENT_SENSOR, temp, {
|
||||
ATTR_UNIT_OF_MEASUREMENT: unit
|
||||
})
|
||||
self.hass.states.set(ENT_SENSOR, temp)
|
||||
|
||||
def _setup_switch(self, is_on):
|
||||
"""Set up the test switch."""
|
||||
@@ -626,11 +604,9 @@ class TestClimateGenericThermostatACModeMinCycle(unittest.TestCase):
|
||||
self.assertEqual(SERVICE_TURN_OFF, call.service)
|
||||
self.assertEqual(ENT_SWITCH, call.data['entity_id'])
|
||||
|
||||
def _setup_sensor(self, temp, unit=TEMP_CELSIUS):
|
||||
def _setup_sensor(self, temp):
|
||||
"""Set up the test sensor."""
|
||||
self.hass.states.set(ENT_SENSOR, temp, {
|
||||
ATTR_UNIT_OF_MEASUREMENT: unit
|
||||
})
|
||||
self.hass.states.set(ENT_SENSOR, temp)
|
||||
|
||||
def _setup_switch(self, is_on):
|
||||
"""Set up the test switch."""
|
||||
@@ -719,11 +695,9 @@ class TestClimateGenericThermostatMinCycle(unittest.TestCase):
|
||||
self.assertEqual(SERVICE_TURN_OFF, call.service)
|
||||
self.assertEqual(ENT_SWITCH, call.data['entity_id'])
|
||||
|
||||
def _setup_sensor(self, temp, unit=TEMP_CELSIUS):
|
||||
def _setup_sensor(self, temp):
|
||||
"""Set up the test sensor."""
|
||||
self.hass.states.set(ENT_SENSOR, temp, {
|
||||
ATTR_UNIT_OF_MEASUREMENT: unit
|
||||
})
|
||||
self.hass.states.set(ENT_SENSOR, temp)
|
||||
|
||||
def _setup_switch(self, is_on):
|
||||
"""Set up the test switch."""
|
||||
@@ -812,11 +786,9 @@ class TestClimateGenericThermostatACKeepAlive(unittest.TestCase):
|
||||
"""Send a time changed event."""
|
||||
self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: now})
|
||||
|
||||
def _setup_sensor(self, temp, unit=TEMP_CELSIUS):
|
||||
def _setup_sensor(self, temp):
|
||||
"""Set up the test sensor."""
|
||||
self.hass.states.set(ENT_SENSOR, temp, {
|
||||
ATTR_UNIT_OF_MEASUREMENT: unit
|
||||
})
|
||||
self.hass.states.set(ENT_SENSOR, temp)
|
||||
|
||||
def _setup_switch(self, is_on):
|
||||
"""Set up the test switch."""
|
||||
@@ -904,11 +876,9 @@ class TestClimateGenericThermostatKeepAlive(unittest.TestCase):
|
||||
"""Send a time changed event."""
|
||||
self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: now})
|
||||
|
||||
def _setup_sensor(self, temp, unit=TEMP_CELSIUS):
|
||||
def _setup_sensor(self, temp):
|
||||
"""Set up the test sensor."""
|
||||
self.hass.states.set(ENT_SENSOR, temp, {
|
||||
ATTR_UNIT_OF_MEASUREMENT: unit
|
||||
})
|
||||
self.hass.states.set(ENT_SENSOR, temp)
|
||||
|
||||
def _setup_switch(self, is_on):
|
||||
"""Set up the test switch."""
|
||||
@@ -1047,11 +1017,9 @@ class TestClimateGenericThermostatRestoreState(unittest.TestCase):
|
||||
'ac_mode': True
|
||||
}})
|
||||
|
||||
def _setup_sensor(self, temp, unit=TEMP_CELSIUS):
|
||||
def _setup_sensor(self, temp):
|
||||
"""Set up the test sensor."""
|
||||
self.hass.states.set(ENT_SENSOR, temp, {
|
||||
ATTR_UNIT_OF_MEASUREMENT: unit
|
||||
})
|
||||
self.hass.states.set(ENT_SENSOR, temp)
|
||||
|
||||
def _setup_switch(self, is_on):
|
||||
"""Set up the test switch."""
|
||||
|
||||
@@ -232,10 +232,10 @@ def test_query_climate_request(hass_fixture, assistant_client):
|
||||
def test_query_climate_request_f(hass_fixture, assistant_client):
|
||||
"""Test a query request."""
|
||||
# Mock demo devices as fahrenheit to see if we convert to celsius
|
||||
hass_fixture.config.units.temperature_unit = const.TEMP_FAHRENHEIT
|
||||
for entity_id in ('climate.hvac', 'climate.heatpump', 'climate.ecobee'):
|
||||
state = hass_fixture.states.get(entity_id)
|
||||
attr = dict(state.attributes)
|
||||
attr[const.ATTR_UNIT_OF_MEASUREMENT] = const.TEMP_FAHRENHEIT
|
||||
hass_fixture.states.async_set(entity_id, state.state, attr)
|
||||
|
||||
reqid = '5711642932632160984'
|
||||
@@ -282,6 +282,7 @@ def test_query_climate_request_f(hass_fixture, assistant_client):
|
||||
'thermostatMode': 'cool',
|
||||
'thermostatHumidityAmbient': 54,
|
||||
}
|
||||
hass_fixture.config.units.temperature_unit = const.TEMP_CELSIUS
|
||||
|
||||
|
||||
@asyncio.coroutine
|
||||
|
||||
@@ -3,7 +3,7 @@ import pytest
|
||||
|
||||
from homeassistant.const import (
|
||||
STATE_ON, STATE_OFF, ATTR_ENTITY_ID, SERVICE_TURN_ON, SERVICE_TURN_OFF,
|
||||
ATTR_UNIT_OF_MEASUREMENT, TEMP_CELSIUS, TEMP_FAHRENHEIT)
|
||||
TEMP_CELSIUS, TEMP_FAHRENHEIT)
|
||||
from homeassistant.core import State, DOMAIN as HA_DOMAIN
|
||||
from homeassistant.components import (
|
||||
climate,
|
||||
@@ -27,7 +27,7 @@ async def test_brightness_light(hass):
|
||||
assert trait.BrightnessTrait.supported(light.DOMAIN,
|
||||
light.SUPPORT_BRIGHTNESS)
|
||||
|
||||
trt = trait.BrightnessTrait(State('light.bla', light.STATE_ON, {
|
||||
trt = trait.BrightnessTrait(hass, State('light.bla', light.STATE_ON, {
|
||||
light.ATTR_BRIGHTNESS: 243
|
||||
}))
|
||||
|
||||
@@ -38,7 +38,7 @@ async def test_brightness_light(hass):
|
||||
}
|
||||
|
||||
calls = async_mock_service(hass, light.DOMAIN, light.SERVICE_TURN_ON)
|
||||
await trt.execute(hass, trait.COMMAND_BRIGHTNESS_ABSOLUTE, {
|
||||
await trt.execute(trait.COMMAND_BRIGHTNESS_ABSOLUTE, {
|
||||
'brightness': 50
|
||||
})
|
||||
assert len(calls) == 1
|
||||
@@ -53,7 +53,7 @@ async def test_brightness_cover(hass):
|
||||
assert trait.BrightnessTrait.supported(cover.DOMAIN,
|
||||
cover.SUPPORT_SET_POSITION)
|
||||
|
||||
trt = trait.BrightnessTrait(State('cover.bla', cover.STATE_OPEN, {
|
||||
trt = trait.BrightnessTrait(hass, State('cover.bla', cover.STATE_OPEN, {
|
||||
cover.ATTR_CURRENT_POSITION: 75
|
||||
}))
|
||||
|
||||
@@ -65,7 +65,7 @@ async def test_brightness_cover(hass):
|
||||
|
||||
calls = async_mock_service(
|
||||
hass, cover.DOMAIN, cover.SERVICE_SET_COVER_POSITION)
|
||||
await trt.execute(hass, trait.COMMAND_BRIGHTNESS_ABSOLUTE, {
|
||||
await trt.execute(trait.COMMAND_BRIGHTNESS_ABSOLUTE, {
|
||||
'brightness': 50
|
||||
})
|
||||
assert len(calls) == 1
|
||||
@@ -80,7 +80,7 @@ async def test_brightness_media_player(hass):
|
||||
assert trait.BrightnessTrait.supported(media_player.DOMAIN,
|
||||
media_player.SUPPORT_VOLUME_SET)
|
||||
|
||||
trt = trait.BrightnessTrait(State(
|
||||
trt = trait.BrightnessTrait(hass, State(
|
||||
'media_player.bla', media_player.STATE_PLAYING, {
|
||||
media_player.ATTR_MEDIA_VOLUME_LEVEL: .3
|
||||
}))
|
||||
@@ -93,7 +93,7 @@ async def test_brightness_media_player(hass):
|
||||
|
||||
calls = async_mock_service(
|
||||
hass, media_player.DOMAIN, media_player.SERVICE_VOLUME_SET)
|
||||
await trt.execute(hass, trait.COMMAND_BRIGHTNESS_ABSOLUTE, {
|
||||
await trt.execute(trait.COMMAND_BRIGHTNESS_ABSOLUTE, {
|
||||
'brightness': 60
|
||||
})
|
||||
assert len(calls) == 1
|
||||
@@ -107,7 +107,7 @@ async def test_onoff_group(hass):
|
||||
"""Test OnOff trait support for group domain."""
|
||||
assert trait.OnOffTrait.supported(media_player.DOMAIN, 0)
|
||||
|
||||
trt_on = trait.OnOffTrait(State('group.bla', STATE_ON))
|
||||
trt_on = trait.OnOffTrait(hass, State('group.bla', STATE_ON))
|
||||
|
||||
assert trt_on.sync_attributes() == {}
|
||||
|
||||
@@ -115,13 +115,13 @@ async def test_onoff_group(hass):
|
||||
'on': True
|
||||
}
|
||||
|
||||
trt_off = trait.OnOffTrait(State('group.bla', STATE_OFF))
|
||||
trt_off = trait.OnOffTrait(hass, State('group.bla', STATE_OFF))
|
||||
assert trt_off.query_attributes() == {
|
||||
'on': False
|
||||
}
|
||||
|
||||
on_calls = async_mock_service(hass, HA_DOMAIN, SERVICE_TURN_ON)
|
||||
await trt_on.execute(hass, trait.COMMAND_ONOFF, {
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, {
|
||||
'on': True
|
||||
})
|
||||
assert len(on_calls) == 1
|
||||
@@ -130,7 +130,7 @@ async def test_onoff_group(hass):
|
||||
}
|
||||
|
||||
off_calls = async_mock_service(hass, HA_DOMAIN, SERVICE_TURN_OFF)
|
||||
await trt_on.execute(hass, trait.COMMAND_ONOFF, {
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, {
|
||||
'on': False
|
||||
})
|
||||
assert len(off_calls) == 1
|
||||
@@ -143,7 +143,7 @@ async def test_onoff_input_boolean(hass):
|
||||
"""Test OnOff trait support for input_boolean domain."""
|
||||
assert trait.OnOffTrait.supported(media_player.DOMAIN, 0)
|
||||
|
||||
trt_on = trait.OnOffTrait(State('input_boolean.bla', STATE_ON))
|
||||
trt_on = trait.OnOffTrait(hass, State('input_boolean.bla', STATE_ON))
|
||||
|
||||
assert trt_on.sync_attributes() == {}
|
||||
|
||||
@@ -151,13 +151,13 @@ async def test_onoff_input_boolean(hass):
|
||||
'on': True
|
||||
}
|
||||
|
||||
trt_off = trait.OnOffTrait(State('input_boolean.bla', STATE_OFF))
|
||||
trt_off = trait.OnOffTrait(hass, State('input_boolean.bla', STATE_OFF))
|
||||
assert trt_off.query_attributes() == {
|
||||
'on': False
|
||||
}
|
||||
|
||||
on_calls = async_mock_service(hass, input_boolean.DOMAIN, SERVICE_TURN_ON)
|
||||
await trt_on.execute(hass, trait.COMMAND_ONOFF, {
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, {
|
||||
'on': True
|
||||
})
|
||||
assert len(on_calls) == 1
|
||||
@@ -167,7 +167,7 @@ async def test_onoff_input_boolean(hass):
|
||||
|
||||
off_calls = async_mock_service(hass, input_boolean.DOMAIN,
|
||||
SERVICE_TURN_OFF)
|
||||
await trt_on.execute(hass, trait.COMMAND_ONOFF, {
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, {
|
||||
'on': False
|
||||
})
|
||||
assert len(off_calls) == 1
|
||||
@@ -180,7 +180,7 @@ async def test_onoff_switch(hass):
|
||||
"""Test OnOff trait support for switch domain."""
|
||||
assert trait.OnOffTrait.supported(media_player.DOMAIN, 0)
|
||||
|
||||
trt_on = trait.OnOffTrait(State('switch.bla', STATE_ON))
|
||||
trt_on = trait.OnOffTrait(hass, State('switch.bla', STATE_ON))
|
||||
|
||||
assert trt_on.sync_attributes() == {}
|
||||
|
||||
@@ -188,13 +188,13 @@ async def test_onoff_switch(hass):
|
||||
'on': True
|
||||
}
|
||||
|
||||
trt_off = trait.OnOffTrait(State('switch.bla', STATE_OFF))
|
||||
trt_off = trait.OnOffTrait(hass, State('switch.bla', STATE_OFF))
|
||||
assert trt_off.query_attributes() == {
|
||||
'on': False
|
||||
}
|
||||
|
||||
on_calls = async_mock_service(hass, switch.DOMAIN, SERVICE_TURN_ON)
|
||||
await trt_on.execute(hass, trait.COMMAND_ONOFF, {
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, {
|
||||
'on': True
|
||||
})
|
||||
assert len(on_calls) == 1
|
||||
@@ -203,7 +203,7 @@ async def test_onoff_switch(hass):
|
||||
}
|
||||
|
||||
off_calls = async_mock_service(hass, switch.DOMAIN, SERVICE_TURN_OFF)
|
||||
await trt_on.execute(hass, trait.COMMAND_ONOFF, {
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, {
|
||||
'on': False
|
||||
})
|
||||
assert len(off_calls) == 1
|
||||
@@ -216,7 +216,7 @@ async def test_onoff_fan(hass):
|
||||
"""Test OnOff trait support for fan domain."""
|
||||
assert trait.OnOffTrait.supported(media_player.DOMAIN, 0)
|
||||
|
||||
trt_on = trait.OnOffTrait(State('fan.bla', STATE_ON))
|
||||
trt_on = trait.OnOffTrait(hass, State('fan.bla', STATE_ON))
|
||||
|
||||
assert trt_on.sync_attributes() == {}
|
||||
|
||||
@@ -224,13 +224,13 @@ async def test_onoff_fan(hass):
|
||||
'on': True
|
||||
}
|
||||
|
||||
trt_off = trait.OnOffTrait(State('fan.bla', STATE_OFF))
|
||||
trt_off = trait.OnOffTrait(hass, State('fan.bla', STATE_OFF))
|
||||
assert trt_off.query_attributes() == {
|
||||
'on': False
|
||||
}
|
||||
|
||||
on_calls = async_mock_service(hass, fan.DOMAIN, SERVICE_TURN_ON)
|
||||
await trt_on.execute(hass, trait.COMMAND_ONOFF, {
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, {
|
||||
'on': True
|
||||
})
|
||||
assert len(on_calls) == 1
|
||||
@@ -239,7 +239,7 @@ async def test_onoff_fan(hass):
|
||||
}
|
||||
|
||||
off_calls = async_mock_service(hass, fan.DOMAIN, SERVICE_TURN_OFF)
|
||||
await trt_on.execute(hass, trait.COMMAND_ONOFF, {
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, {
|
||||
'on': False
|
||||
})
|
||||
assert len(off_calls) == 1
|
||||
@@ -252,7 +252,7 @@ async def test_onoff_light(hass):
|
||||
"""Test OnOff trait support for light domain."""
|
||||
assert trait.OnOffTrait.supported(media_player.DOMAIN, 0)
|
||||
|
||||
trt_on = trait.OnOffTrait(State('light.bla', STATE_ON))
|
||||
trt_on = trait.OnOffTrait(hass, State('light.bla', STATE_ON))
|
||||
|
||||
assert trt_on.sync_attributes() == {}
|
||||
|
||||
@@ -260,13 +260,13 @@ async def test_onoff_light(hass):
|
||||
'on': True
|
||||
}
|
||||
|
||||
trt_off = trait.OnOffTrait(State('light.bla', STATE_OFF))
|
||||
trt_off = trait.OnOffTrait(hass, State('light.bla', STATE_OFF))
|
||||
assert trt_off.query_attributes() == {
|
||||
'on': False
|
||||
}
|
||||
|
||||
on_calls = async_mock_service(hass, light.DOMAIN, SERVICE_TURN_ON)
|
||||
await trt_on.execute(hass, trait.COMMAND_ONOFF, {
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, {
|
||||
'on': True
|
||||
})
|
||||
assert len(on_calls) == 1
|
||||
@@ -275,7 +275,7 @@ async def test_onoff_light(hass):
|
||||
}
|
||||
|
||||
off_calls = async_mock_service(hass, light.DOMAIN, SERVICE_TURN_OFF)
|
||||
await trt_on.execute(hass, trait.COMMAND_ONOFF, {
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, {
|
||||
'on': False
|
||||
})
|
||||
assert len(off_calls) == 1
|
||||
@@ -288,7 +288,7 @@ async def test_onoff_cover(hass):
|
||||
"""Test OnOff trait support for cover domain."""
|
||||
assert trait.OnOffTrait.supported(media_player.DOMAIN, 0)
|
||||
|
||||
trt_on = trait.OnOffTrait(State('cover.bla', cover.STATE_OPEN))
|
||||
trt_on = trait.OnOffTrait(hass, State('cover.bla', cover.STATE_OPEN))
|
||||
|
||||
assert trt_on.sync_attributes() == {}
|
||||
|
||||
@@ -296,13 +296,13 @@ async def test_onoff_cover(hass):
|
||||
'on': True
|
||||
}
|
||||
|
||||
trt_off = trait.OnOffTrait(State('cover.bla', cover.STATE_CLOSED))
|
||||
trt_off = trait.OnOffTrait(hass, State('cover.bla', cover.STATE_CLOSED))
|
||||
assert trt_off.query_attributes() == {
|
||||
'on': False
|
||||
}
|
||||
|
||||
on_calls = async_mock_service(hass, cover.DOMAIN, cover.SERVICE_OPEN_COVER)
|
||||
await trt_on.execute(hass, trait.COMMAND_ONOFF, {
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, {
|
||||
'on': True
|
||||
})
|
||||
assert len(on_calls) == 1
|
||||
@@ -312,7 +312,7 @@ async def test_onoff_cover(hass):
|
||||
|
||||
off_calls = async_mock_service(hass, cover.DOMAIN,
|
||||
cover.SERVICE_CLOSE_COVER)
|
||||
await trt_on.execute(hass, trait.COMMAND_ONOFF, {
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, {
|
||||
'on': False
|
||||
})
|
||||
assert len(off_calls) == 1
|
||||
@@ -325,7 +325,7 @@ async def test_onoff_media_player(hass):
|
||||
"""Test OnOff trait support for media_player domain."""
|
||||
assert trait.OnOffTrait.supported(media_player.DOMAIN, 0)
|
||||
|
||||
trt_on = trait.OnOffTrait(State('media_player.bla', STATE_ON))
|
||||
trt_on = trait.OnOffTrait(hass, State('media_player.bla', STATE_ON))
|
||||
|
||||
assert trt_on.sync_attributes() == {}
|
||||
|
||||
@@ -333,13 +333,13 @@ async def test_onoff_media_player(hass):
|
||||
'on': True
|
||||
}
|
||||
|
||||
trt_off = trait.OnOffTrait(State('media_player.bla', STATE_OFF))
|
||||
trt_off = trait.OnOffTrait(hass, State('media_player.bla', STATE_OFF))
|
||||
assert trt_off.query_attributes() == {
|
||||
'on': False
|
||||
}
|
||||
|
||||
on_calls = async_mock_service(hass, media_player.DOMAIN, SERVICE_TURN_ON)
|
||||
await trt_on.execute(hass, trait.COMMAND_ONOFF, {
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, {
|
||||
'on': True
|
||||
})
|
||||
assert len(on_calls) == 1
|
||||
@@ -348,7 +348,7 @@ async def test_onoff_media_player(hass):
|
||||
}
|
||||
|
||||
off_calls = async_mock_service(hass, media_player.DOMAIN, SERVICE_TURN_OFF)
|
||||
await trt_on.execute(hass, trait.COMMAND_ONOFF, {
|
||||
await trt_on.execute(trait.COMMAND_ONOFF, {
|
||||
'on': False
|
||||
})
|
||||
assert len(off_calls) == 1
|
||||
@@ -363,7 +363,7 @@ async def test_color_spectrum_light(hass):
|
||||
assert trait.ColorSpectrumTrait.supported(light.DOMAIN,
|
||||
light.SUPPORT_COLOR)
|
||||
|
||||
trt = trait.ColorSpectrumTrait(State('light.bla', STATE_ON, {
|
||||
trt = trait.ColorSpectrumTrait(hass, State('light.bla', STATE_ON, {
|
||||
light.ATTR_HS_COLOR: (0, 94),
|
||||
}))
|
||||
|
||||
@@ -389,7 +389,7 @@ async def test_color_spectrum_light(hass):
|
||||
})
|
||||
|
||||
calls = async_mock_service(hass, light.DOMAIN, SERVICE_TURN_ON)
|
||||
await trt.execute(hass, trait.COMMAND_COLOR_ABSOLUTE, {
|
||||
await trt.execute(trait.COMMAND_COLOR_ABSOLUTE, {
|
||||
'color': {
|
||||
'spectrumRGB': 1052927
|
||||
}
|
||||
@@ -407,7 +407,7 @@ async def test_color_temperature_light(hass):
|
||||
assert trait.ColorTemperatureTrait.supported(light.DOMAIN,
|
||||
light.SUPPORT_COLOR_TEMP)
|
||||
|
||||
trt = trait.ColorTemperatureTrait(State('light.bla', STATE_ON, {
|
||||
trt = trait.ColorTemperatureTrait(hass, State('light.bla', STATE_ON, {
|
||||
light.ATTR_MIN_MIREDS: 200,
|
||||
light.ATTR_COLOR_TEMP: 300,
|
||||
light.ATTR_MAX_MIREDS: 500,
|
||||
@@ -438,14 +438,14 @@ async def test_color_temperature_light(hass):
|
||||
calls = async_mock_service(hass, light.DOMAIN, SERVICE_TURN_ON)
|
||||
|
||||
with pytest.raises(helpers.SmartHomeError) as err:
|
||||
await trt.execute(hass, trait.COMMAND_COLOR_ABSOLUTE, {
|
||||
await trt.execute(trait.COMMAND_COLOR_ABSOLUTE, {
|
||||
'color': {
|
||||
'temperature': 5555
|
||||
}
|
||||
})
|
||||
assert err.value.code == const.ERR_VALUE_OUT_OF_RANGE
|
||||
|
||||
await trt.execute(hass, trait.COMMAND_COLOR_ABSOLUTE, {
|
||||
await trt.execute(trait.COMMAND_COLOR_ABSOLUTE, {
|
||||
'color': {
|
||||
'temperature': 2857
|
||||
}
|
||||
@@ -461,13 +461,13 @@ async def test_scene_scene(hass):
|
||||
"""Test Scene trait support for scene domain."""
|
||||
assert trait.SceneTrait.supported(scene.DOMAIN, 0)
|
||||
|
||||
trt = trait.SceneTrait(State('scene.bla', scene.STATE))
|
||||
trt = trait.SceneTrait(hass, State('scene.bla', scene.STATE))
|
||||
assert trt.sync_attributes() == {}
|
||||
assert trt.query_attributes() == {}
|
||||
assert trt.can_execute(trait.COMMAND_ACTIVATE_SCENE, {})
|
||||
|
||||
calls = async_mock_service(hass, scene.DOMAIN, SERVICE_TURN_ON)
|
||||
await trt.execute(hass, trait.COMMAND_ACTIVATE_SCENE, {})
|
||||
await trt.execute(trait.COMMAND_ACTIVATE_SCENE, {})
|
||||
assert len(calls) == 1
|
||||
assert calls[0].data == {
|
||||
ATTR_ENTITY_ID: 'scene.bla',
|
||||
@@ -478,13 +478,13 @@ async def test_scene_script(hass):
|
||||
"""Test Scene trait support for script domain."""
|
||||
assert trait.SceneTrait.supported(script.DOMAIN, 0)
|
||||
|
||||
trt = trait.SceneTrait(State('script.bla', STATE_OFF))
|
||||
trt = trait.SceneTrait(hass, State('script.bla', STATE_OFF))
|
||||
assert trt.sync_attributes() == {}
|
||||
assert trt.query_attributes() == {}
|
||||
assert trt.can_execute(trait.COMMAND_ACTIVATE_SCENE, {})
|
||||
|
||||
calls = async_mock_service(hass, script.DOMAIN, SERVICE_TURN_ON)
|
||||
await trt.execute(hass, trait.COMMAND_ACTIVATE_SCENE, {})
|
||||
await trt.execute(trait.COMMAND_ACTIVATE_SCENE, {})
|
||||
|
||||
# We don't wait till script execution is done.
|
||||
await hass.async_block_till_done()
|
||||
@@ -501,7 +501,9 @@ async def test_temperature_setting_climate_range(hass):
|
||||
assert trait.TemperatureSettingTrait.supported(
|
||||
climate.DOMAIN, climate.SUPPORT_OPERATION_MODE)
|
||||
|
||||
trt = trait.TemperatureSettingTrait(State(
|
||||
hass.config.units.temperature_unit = TEMP_FAHRENHEIT
|
||||
|
||||
trt = trait.TemperatureSettingTrait(hass, State(
|
||||
'climate.bla', climate.STATE_AUTO, {
|
||||
climate.ATTR_CURRENT_TEMPERATURE: 70,
|
||||
climate.ATTR_CURRENT_HUMIDITY: 25,
|
||||
@@ -515,8 +517,7 @@ async def test_temperature_setting_climate_range(hass):
|
||||
climate.ATTR_TARGET_TEMP_HIGH: 75,
|
||||
climate.ATTR_TARGET_TEMP_LOW: 65,
|
||||
climate.ATTR_MIN_TEMP: 50,
|
||||
climate.ATTR_MAX_TEMP: 80,
|
||||
ATTR_UNIT_OF_MEASUREMENT: TEMP_FAHRENHEIT,
|
||||
climate.ATTR_MAX_TEMP: 80
|
||||
}))
|
||||
assert trt.sync_attributes() == {
|
||||
'availableThermostatModes': 'off,cool,heat,heatcool',
|
||||
@@ -535,7 +536,7 @@ async def test_temperature_setting_climate_range(hass):
|
||||
|
||||
calls = async_mock_service(
|
||||
hass, climate.DOMAIN, climate.SERVICE_SET_TEMPERATURE)
|
||||
await trt.execute(hass, trait.COMMAND_THERMOSTAT_TEMPERATURE_SET_RANGE, {
|
||||
await trt.execute(trait.COMMAND_THERMOSTAT_TEMPERATURE_SET_RANGE, {
|
||||
'thermostatTemperatureSetpointHigh': 25,
|
||||
'thermostatTemperatureSetpointLow': 20,
|
||||
})
|
||||
@@ -548,7 +549,7 @@ async def test_temperature_setting_climate_range(hass):
|
||||
|
||||
calls = async_mock_service(
|
||||
hass, climate.DOMAIN, climate.SERVICE_SET_OPERATION_MODE)
|
||||
await trt.execute(hass, trait.COMMAND_THERMOSTAT_SET_MODE, {
|
||||
await trt.execute(trait.COMMAND_THERMOSTAT_SET_MODE, {
|
||||
'thermostatMode': 'heatcool',
|
||||
})
|
||||
assert len(calls) == 1
|
||||
@@ -558,11 +559,11 @@ async def test_temperature_setting_climate_range(hass):
|
||||
}
|
||||
|
||||
with pytest.raises(helpers.SmartHomeError) as err:
|
||||
await trt.execute(
|
||||
hass, trait.COMMAND_THERMOSTAT_TEMPERATURE_SETPOINT, {
|
||||
'thermostatTemperatureSetpoint': -100,
|
||||
})
|
||||
await trt.execute(trait.COMMAND_THERMOSTAT_TEMPERATURE_SETPOINT, {
|
||||
'thermostatTemperatureSetpoint': -100,
|
||||
})
|
||||
assert err.value.code == const.ERR_VALUE_OUT_OF_RANGE
|
||||
hass.config.units.temperature_unit = TEMP_CELSIUS
|
||||
|
||||
|
||||
async def test_temperature_setting_climate_setpoint(hass):
|
||||
@@ -571,7 +572,9 @@ async def test_temperature_setting_climate_setpoint(hass):
|
||||
assert trait.TemperatureSettingTrait.supported(
|
||||
climate.DOMAIN, climate.SUPPORT_OPERATION_MODE)
|
||||
|
||||
trt = trait.TemperatureSettingTrait(State(
|
||||
hass.config.units.temperature_unit = TEMP_CELSIUS
|
||||
|
||||
trt = trait.TemperatureSettingTrait(hass, State(
|
||||
'climate.bla', climate.STATE_AUTO, {
|
||||
climate.ATTR_OPERATION_MODE: climate.STATE_COOL,
|
||||
climate.ATTR_OPERATION_LIST: [
|
||||
@@ -581,8 +584,7 @@ async def test_temperature_setting_climate_setpoint(hass):
|
||||
climate.ATTR_MIN_TEMP: 10,
|
||||
climate.ATTR_MAX_TEMP: 30,
|
||||
climate.ATTR_TEMPERATURE: 18,
|
||||
climate.ATTR_CURRENT_TEMPERATURE: 20,
|
||||
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS,
|
||||
climate.ATTR_CURRENT_TEMPERATURE: 20
|
||||
}))
|
||||
assert trt.sync_attributes() == {
|
||||
'availableThermostatModes': 'off,cool',
|
||||
@@ -601,12 +603,11 @@ async def test_temperature_setting_climate_setpoint(hass):
|
||||
hass, climate.DOMAIN, climate.SERVICE_SET_TEMPERATURE)
|
||||
|
||||
with pytest.raises(helpers.SmartHomeError):
|
||||
await trt.execute(
|
||||
hass, trait.COMMAND_THERMOSTAT_TEMPERATURE_SETPOINT, {
|
||||
'thermostatTemperatureSetpoint': -100,
|
||||
})
|
||||
await trt.execute(trait.COMMAND_THERMOSTAT_TEMPERATURE_SETPOINT, {
|
||||
'thermostatTemperatureSetpoint': -100,
|
||||
})
|
||||
|
||||
await trt.execute(hass, trait.COMMAND_THERMOSTAT_TEMPERATURE_SETPOINT, {
|
||||
await trt.execute(trait.COMMAND_THERMOSTAT_TEMPERATURE_SETPOINT, {
|
||||
'thermostatTemperatureSetpoint': 19,
|
||||
})
|
||||
assert len(calls) == 1
|
||||
|
||||
@@ -12,8 +12,8 @@ from homeassistant.components.climate import (
|
||||
from homeassistant.components.homekit.const import (
|
||||
PROP_MAX_VALUE, PROP_MIN_VALUE)
|
||||
from homeassistant.const import (
|
||||
ATTR_ENTITY_ID, ATTR_SUPPORTED_FEATURES, ATTR_UNIT_OF_MEASUREMENT,
|
||||
CONF_TEMPERATURE_UNIT, STATE_OFF, TEMP_CELSIUS, TEMP_FAHRENHEIT)
|
||||
ATTR_ENTITY_ID, ATTR_SUPPORTED_FEATURES, CONF_TEMPERATURE_UNIT, STATE_OFF,
|
||||
TEMP_FAHRENHEIT)
|
||||
|
||||
from tests.common import async_mock_service
|
||||
from tests.components.homekit.common import patch_debounce
|
||||
@@ -58,8 +58,7 @@ async def test_default_thermostat(hass, hk_driver, cls):
|
||||
hass.states.async_set(entity_id, STATE_HEAT,
|
||||
{ATTR_OPERATION_MODE: STATE_HEAT,
|
||||
ATTR_TEMPERATURE: 22.0,
|
||||
ATTR_CURRENT_TEMPERATURE: 18.0,
|
||||
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS})
|
||||
ATTR_CURRENT_TEMPERATURE: 18.0})
|
||||
await hass.async_block_till_done()
|
||||
assert acc.char_target_temp.value == 22.0
|
||||
assert acc.char_current_heat_cool.value == 1
|
||||
@@ -70,8 +69,7 @@ async def test_default_thermostat(hass, hk_driver, cls):
|
||||
hass.states.async_set(entity_id, STATE_HEAT,
|
||||
{ATTR_OPERATION_MODE: STATE_HEAT,
|
||||
ATTR_TEMPERATURE: 22.0,
|
||||
ATTR_CURRENT_TEMPERATURE: 23.0,
|
||||
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS})
|
||||
ATTR_CURRENT_TEMPERATURE: 23.0})
|
||||
await hass.async_block_till_done()
|
||||
assert acc.char_target_temp.value == 22.0
|
||||
assert acc.char_current_heat_cool.value == 0
|
||||
@@ -82,8 +80,7 @@ async def test_default_thermostat(hass, hk_driver, cls):
|
||||
hass.states.async_set(entity_id, STATE_COOL,
|
||||
{ATTR_OPERATION_MODE: STATE_COOL,
|
||||
ATTR_TEMPERATURE: 20.0,
|
||||
ATTR_CURRENT_TEMPERATURE: 25.0,
|
||||
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS})
|
||||
ATTR_CURRENT_TEMPERATURE: 25.0})
|
||||
await hass.async_block_till_done()
|
||||
assert acc.char_target_temp.value == 20.0
|
||||
assert acc.char_current_heat_cool.value == 2
|
||||
@@ -94,8 +91,7 @@ async def test_default_thermostat(hass, hk_driver, cls):
|
||||
hass.states.async_set(entity_id, STATE_COOL,
|
||||
{ATTR_OPERATION_MODE: STATE_COOL,
|
||||
ATTR_TEMPERATURE: 20.0,
|
||||
ATTR_CURRENT_TEMPERATURE: 19.0,
|
||||
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS})
|
||||
ATTR_CURRENT_TEMPERATURE: 19.0})
|
||||
await hass.async_block_till_done()
|
||||
assert acc.char_target_temp.value == 20.0
|
||||
assert acc.char_current_heat_cool.value == 0
|
||||
@@ -106,8 +102,7 @@ async def test_default_thermostat(hass, hk_driver, cls):
|
||||
hass.states.async_set(entity_id, STATE_OFF,
|
||||
{ATTR_OPERATION_MODE: STATE_OFF,
|
||||
ATTR_TEMPERATURE: 22.0,
|
||||
ATTR_CURRENT_TEMPERATURE: 18.0,
|
||||
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS})
|
||||
ATTR_CURRENT_TEMPERATURE: 18.0})
|
||||
await hass.async_block_till_done()
|
||||
assert acc.char_target_temp.value == 22.0
|
||||
assert acc.char_current_heat_cool.value == 0
|
||||
@@ -119,8 +114,7 @@ async def test_default_thermostat(hass, hk_driver, cls):
|
||||
{ATTR_OPERATION_MODE: STATE_AUTO,
|
||||
ATTR_OPERATION_LIST: [STATE_HEAT, STATE_COOL],
|
||||
ATTR_TEMPERATURE: 22.0,
|
||||
ATTR_CURRENT_TEMPERATURE: 18.0,
|
||||
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS})
|
||||
ATTR_CURRENT_TEMPERATURE: 18.0})
|
||||
await hass.async_block_till_done()
|
||||
assert acc.char_target_temp.value == 22.0
|
||||
assert acc.char_current_heat_cool.value == 1
|
||||
@@ -132,8 +126,7 @@ async def test_default_thermostat(hass, hk_driver, cls):
|
||||
{ATTR_OPERATION_MODE: STATE_AUTO,
|
||||
ATTR_OPERATION_LIST: [STATE_HEAT, STATE_COOL],
|
||||
ATTR_TEMPERATURE: 22.0,
|
||||
ATTR_CURRENT_TEMPERATURE: 25.0,
|
||||
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS})
|
||||
ATTR_CURRENT_TEMPERATURE: 25.0})
|
||||
await hass.async_block_till_done()
|
||||
assert acc.char_target_temp.value == 22.0
|
||||
assert acc.char_current_heat_cool.value == 2
|
||||
@@ -145,8 +138,7 @@ async def test_default_thermostat(hass, hk_driver, cls):
|
||||
{ATTR_OPERATION_MODE: STATE_AUTO,
|
||||
ATTR_OPERATION_LIST: [STATE_HEAT, STATE_COOL],
|
||||
ATTR_TEMPERATURE: 22.0,
|
||||
ATTR_CURRENT_TEMPERATURE: 22.0,
|
||||
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS})
|
||||
ATTR_CURRENT_TEMPERATURE: 22.0})
|
||||
await hass.async_block_till_done()
|
||||
assert acc.char_target_temp.value == 22.0
|
||||
assert acc.char_current_heat_cool.value == 0
|
||||
@@ -201,8 +193,7 @@ async def test_auto_thermostat(hass, hk_driver, cls):
|
||||
{ATTR_OPERATION_MODE: STATE_AUTO,
|
||||
ATTR_TARGET_TEMP_HIGH: 22.0,
|
||||
ATTR_TARGET_TEMP_LOW: 20.0,
|
||||
ATTR_CURRENT_TEMPERATURE: 18.0,
|
||||
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS})
|
||||
ATTR_CURRENT_TEMPERATURE: 18.0})
|
||||
await hass.async_block_till_done()
|
||||
assert acc.char_heating_thresh_temp.value == 20.0
|
||||
assert acc.char_cooling_thresh_temp.value == 22.0
|
||||
@@ -215,8 +206,7 @@ async def test_auto_thermostat(hass, hk_driver, cls):
|
||||
{ATTR_OPERATION_MODE: STATE_AUTO,
|
||||
ATTR_TARGET_TEMP_HIGH: 23.0,
|
||||
ATTR_TARGET_TEMP_LOW: 19.0,
|
||||
ATTR_CURRENT_TEMPERATURE: 24.0,
|
||||
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS})
|
||||
ATTR_CURRENT_TEMPERATURE: 24.0})
|
||||
await hass.async_block_till_done()
|
||||
assert acc.char_heating_thresh_temp.value == 19.0
|
||||
assert acc.char_cooling_thresh_temp.value == 23.0
|
||||
@@ -229,8 +219,7 @@ async def test_auto_thermostat(hass, hk_driver, cls):
|
||||
{ATTR_OPERATION_MODE: STATE_AUTO,
|
||||
ATTR_TARGET_TEMP_HIGH: 23.0,
|
||||
ATTR_TARGET_TEMP_LOW: 19.0,
|
||||
ATTR_CURRENT_TEMPERATURE: 21.0,
|
||||
ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS})
|
||||
ATTR_CURRENT_TEMPERATURE: 21.0})
|
||||
await hass.async_block_till_done()
|
||||
assert acc.char_heating_thresh_temp.value == 19.0
|
||||
assert acc.char_cooling_thresh_temp.value == 23.0
|
||||
@@ -334,8 +323,7 @@ async def test_thermostat_fahrenheit(hass, hk_driver, cls):
|
||||
ATTR_TARGET_TEMP_HIGH: 75.2,
|
||||
ATTR_TARGET_TEMP_LOW: 68,
|
||||
ATTR_TEMPERATURE: 71.6,
|
||||
ATTR_CURRENT_TEMPERATURE: 73.4,
|
||||
ATTR_UNIT_OF_MEASUREMENT: TEMP_FAHRENHEIT})
|
||||
ATTR_CURRENT_TEMPERATURE: 73.4})
|
||||
await hass.async_block_till_done()
|
||||
assert acc.char_heating_thresh_temp.value == 20.0
|
||||
assert acc.char_cooling_thresh_temp.value == 24.0
|
||||
|
||||
Reference in new issue
Block a user