evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use load_json_object in ecobee (#88584)

Browse source 
* Use load_json_object in ecobee

* Adjust tests
This commit is contained in:
epenet 2023-02-22 13:58:07 +01:00 • committed by GitHub
parent db6dba87e5
commit 3f11fbfda8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
homeassistant/components/ecobee/config_flow.py
View file

@ -10,7 +10,7 @@ import voluptuous as vol
from homeassistant import config_entries
from homeassistant.const import CONF_API_KEY
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
@ -85,7 +85,7 @@ class EcobeeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
"""
try:
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 = {
ECOBEE_API_KEY: legacy_config[ECOBEE_API_KEY],

6
tests/components/ecobee/test_config_flow.py
View file

@ -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}
with patch(
"homeassistant.components.ecobee.config_flow.load_json",
"homeassistant.components.ecobee.config_flow.load_json_object",
return_value=MOCK_ECOBEE_CONF,
), patch("homeassistant.components.ecobee.config_flow.Ecobee") as mock_ecobee:
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 = {}
with patch(
"homeassistant.components.ecobee.config_flow.load_json",
"homeassistant.components.ecobee.config_flow.load_json_object",
return_value=MOCK_ECOBEE_CONF,
), patch.object(
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}
with patch(
"homeassistant.components.ecobee.config_flow.load_json",
"homeassistant.components.ecobee.config_flow.load_json_object",
return_value=MOCK_ECOBEE_CONF,
), patch(
"homeassistant.components.ecobee.config_flow.Ecobee"