mirror of
https://github.com/home-assistant/core.git
synced 2025-07-10 14:57:09 +00:00
Use load_json_object in ecobee (#88584)
* Use load_json_object in ecobee * Adjust tests
This commit is contained in:
parent
db6dba87e5
commit
3f11fbfda8
@ -10,7 +10,7 @@ import voluptuous as vol
|
|||||||
from homeassistant import config_entries
|
from homeassistant import config_entries
|
||||||
from homeassistant.const import CONF_API_KEY
|
from homeassistant.const import CONF_API_KEY
|
||||||
from homeassistant.exceptions import HomeAssistantError
|
from homeassistant.exceptions import HomeAssistantError
|
||||||
from homeassistant.util.json import load_json
|
from homeassistant.util.json import load_json_object
|
||||||
|
|
||||||
from .const import _LOGGER, CONF_REFRESH_TOKEN, DATA_ECOBEE_CONFIG, DOMAIN
|
from .const import _LOGGER, CONF_REFRESH_TOKEN, DATA_ECOBEE_CONFIG, DOMAIN
|
||||||
|
|
||||||
@ -85,7 +85,7 @@ class EcobeeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
|
|||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
legacy_config = await self.hass.async_add_executor_job(
|
legacy_config = await self.hass.async_add_executor_job(
|
||||||
load_json, self.hass.config.path(ECOBEE_CONFIG_FILENAME)
|
load_json_object, self.hass.config.path(ECOBEE_CONFIG_FILENAME)
|
||||||
)
|
)
|
||||||
config = {
|
config = {
|
||||||
ECOBEE_API_KEY: legacy_config[ECOBEE_API_KEY],
|
ECOBEE_API_KEY: legacy_config[ECOBEE_API_KEY],
|
||||||
|
@ -144,7 +144,7 @@ async def test_import_flow_triggered_with_ecobee_conf_and_valid_data_and_valid_t
|
|||||||
MOCK_ECOBEE_CONF = {ECOBEE_API_KEY: None, ECOBEE_REFRESH_TOKEN: None}
|
MOCK_ECOBEE_CONF = {ECOBEE_API_KEY: None, ECOBEE_REFRESH_TOKEN: None}
|
||||||
|
|
||||||
with patch(
|
with patch(
|
||||||
"homeassistant.components.ecobee.config_flow.load_json",
|
"homeassistant.components.ecobee.config_flow.load_json_object",
|
||||||
return_value=MOCK_ECOBEE_CONF,
|
return_value=MOCK_ECOBEE_CONF,
|
||||||
), patch("homeassistant.components.ecobee.config_flow.Ecobee") as mock_ecobee:
|
), patch("homeassistant.components.ecobee.config_flow.Ecobee") as mock_ecobee:
|
||||||
mock_ecobee = mock_ecobee.return_value
|
mock_ecobee = mock_ecobee.return_value
|
||||||
@ -173,7 +173,7 @@ async def test_import_flow_triggered_with_ecobee_conf_and_invalid_data(
|
|||||||
MOCK_ECOBEE_CONF = {}
|
MOCK_ECOBEE_CONF = {}
|
||||||
|
|
||||||
with patch(
|
with patch(
|
||||||
"homeassistant.components.ecobee.config_flow.load_json",
|
"homeassistant.components.ecobee.config_flow.load_json_object",
|
||||||
return_value=MOCK_ECOBEE_CONF,
|
return_value=MOCK_ECOBEE_CONF,
|
||||||
), patch.object(
|
), patch.object(
|
||||||
flow, "async_step_user", return_value=mock_coro()
|
flow, "async_step_user", return_value=mock_coro()
|
||||||
@ -196,7 +196,7 @@ async def test_import_flow_triggered_with_ecobee_conf_and_valid_data_and_stale_t
|
|||||||
MOCK_ECOBEE_CONF = {ECOBEE_API_KEY: None, ECOBEE_REFRESH_TOKEN: None}
|
MOCK_ECOBEE_CONF = {ECOBEE_API_KEY: None, ECOBEE_REFRESH_TOKEN: None}
|
||||||
|
|
||||||
with patch(
|
with patch(
|
||||||
"homeassistant.components.ecobee.config_flow.load_json",
|
"homeassistant.components.ecobee.config_flow.load_json_object",
|
||||||
return_value=MOCK_ECOBEE_CONF,
|
return_value=MOCK_ECOBEE_CONF,
|
||||||
), patch(
|
), patch(
|
||||||
"homeassistant.components.ecobee.config_flow.Ecobee"
|
"homeassistant.components.ecobee.config_flow.Ecobee"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user