jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-22 04:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

SmartTub: use get_full_status() (#49580)

Browse Source
This commit is contained in:
Matt Zimmerman 2021-04-22 21:55:58 -07:00 committed by GitHub
parent fec6ea3f76
commit e6d94845dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
homeassistant/components/smarttub/controller.py
View File

@ -92,16 +92,14 @@ class SmartTubController:
return data
async def _get_spa_data(self, spa):
status, pumps, lights, reminders = await asyncio.gather(
spa.get_status(),
spa.get_pumps(),
spa.get_lights(),
full_status, reminders = await asyncio.gather(
spa.get_status_full(),
spa.get_reminders(),
)
return {
ATTR_STATUS: status,
ATTR_PUMPS: {pump.id: pump for pump in pumps},
ATTR_LIGHTS: {light.zone: light for light in lights},
ATTR_STATUS: full_status,
ATTR_PUMPS: {pump.id: pump for pump in full_status.pumps},
ATTR_LIGHTS: {light.zone: light for light in full_status.lights},
ATTR_REMINDERS: {reminder.id: reminder for reminder in reminders},
}

12
tests/components/smarttub/conftest.py
View File

@ -42,9 +42,9 @@ def mock_spa():
mock_spa.id = "mockspa1"
mock_spa.brand = "mockbrand1"
mock_spa.model = "mockmodel1"
mock_spa.get_status.return_value = smarttub.SpaState(
full_status = smarttub.SpaStateFull(
mock_spa,
**{
{
"setTemperature": 39,
"water": {"temperature": 38},
"heater": "ON",
@ -69,8 +69,12 @@ def mock_spa():
"uv": "OFF",
"blowoutCycle": "INACTIVE",
"cleanupCycle": "INACTIVE",
"lights": [],
"pumps": [],
},
)
mock_spa.get_status_full.return_value = full_status
mock_circulation_pump = create_autospec(smarttub.SpaPump, instance=True)
mock_circulation_pump.id = "CP"
mock_circulation_pump.spa = mock_spa
@ -89,7 +93,7 @@ def mock_spa():
mock_jet_on.state = smarttub.SpaPump.PumpState.HIGH
mock_jet_on.type = smarttub.SpaPump.PumpType.JET
mock_spa.get_pumps.return_value = [mock_circulation_pump, mock_jet_off, mock_jet_on]
full_status.pumps = [mock_circulation_pump, mock_jet_off, mock_jet_on]
mock_light_off = create_autospec(smarttub.SpaLight, instance=True)
mock_light_off.spa = mock_spa
@ -103,7 +107,7 @@ def mock_spa():
mock_light_on.intensity = 50
mock_light_on.mode = smarttub.SpaLight.LightMode.PURPLE
mock_spa.get_lights.return_value = [mock_light_off, mock_light_on]
full_status.lights = [mock_light_off, mock_light_on]
mock_filter_reminder = create_autospec(smarttub.SpaReminder, instance=True)
mock_filter_reminder.id = "FILTER01"

6
tests/components/smarttub/test_climate.py
View File

@ -42,7 +42,7 @@ async def test_thermostat_update(spa, setup_entry, hass):
assert state.attributes[ATTR_HVAC_ACTION] == CURRENT_HVAC_HEAT
spa.get_status.return_value.heater = "OFF"
spa.get_status_full.return_value.heater = "OFF"
await trigger_update(hass)
state = hass.states.get(entity_id)
@ -85,11 +85,11 @@ async def test_thermostat_update(spa, setup_entry, hass):
)
spa.set_heat_mode.assert_called_with(smarttub.Spa.HeatMode.ECONOMY)
spa.get_status.return_value.heat_mode = smarttub.Spa.HeatMode.ECONOMY
spa.get_status_full.return_value.heat_mode = smarttub.Spa.HeatMode.ECONOMY
await trigger_update(hass)
state = hass.states.get(entity_id)
assert state.attributes.get(ATTR_PRESET_MODE) == PRESET_ECO
spa.get_status.side_effect = smarttub.APIError
spa.get_status_full.side_effect = smarttub.APIError
await trigger_update(hass)
# should not fail

5
tests/components/smarttub/test_light.py
View File

@ -32,9 +32,8 @@ async def test_light(
assert state is not None
assert state.state == light_state
light: SpaLight = next(
light for light in await spa.get_lights() if light.zone == light_zone
)
status = await spa.get_status_full()
light: SpaLight = next(light for light in status.lights if light.zone == light_zone)
await hass.services.async_call(
"light",

3
tests/components/smarttub/test_switch.py
View File

@ -16,7 +16,8 @@ from homeassistant.const import STATE_OFF, STATE_ON
async def test_pumps(spa, setup_entry, hass, pump_id, pump_state, entity_suffix):
"""Test pump entities."""
pump = next(pump for pump in await spa.get_pumps() if pump.id == pump_id)
status = await spa.get_status_full()
pump = next(pump for pump in status.pumps if pump.id == pump_id)
entity_id = f"switch.{spa.brand}_{spa.model}_{entity_suffix}"
state = hass.states.get(entity_id)