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

Refactor version key in glances (#77541)

Browse Source 
* update version key

* Fix merge mistake

Co-authored-by: Erik Montnemery <erik@montnemery.com>
This commit is contained in:
Rami Mosleh 2022-08-31 13:52:52 +03:00 committed by GitHub
parent 105bb3e082
commit b303c8e040
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/components/glances/config_flow.py
View File

@ -36,7 +36,7 @@ DATA_SCHEMA = vol.Schema(
vol.Optional(CONF_USERNAME): str, vol.Optional(CONF_USERNAME): str,
vol.Optional(CONF_PASSWORD): str, vol.Optional(CONF_PASSWORD): str,
vol.Required(CONF_PORT, default=DEFAULT_PORT): int, vol.Required(CONF_PORT, default=DEFAULT_PORT): int,
vol.Required(CONF_VERSION, default=DEFAULT_VERSION): int, vol.Required(CONF_VERSION, default=DEFAULT_VERSION): vol.In(SUPPORTED_VERSIONS),
vol.Optional(CONF_SSL, default=False): bool, vol.Optional(CONF_SSL, default=False): bool,
vol.Optional(CONF_VERIFY_SSL, default=False): bool, vol.Optional(CONF_VERIFY_SSL, default=False): bool,
} }
@ -45,8 +45,6 @@ DATA_SCHEMA = vol.Schema(
async def validate_input(hass: core.HomeAssistant, data): async def validate_input(hass: core.HomeAssistant, data):
"""Validate the user input allows us to connect.""" """Validate the user input allows us to connect."""
if data[CONF_VERSION] not in SUPPORTED_VERSIONS:
raise WrongVersion
try: try:
api = get_api(hass, data) api = get_api(hass, data)
await api.get_data("all") await api.get_data("all")
@ -81,8 +79,6 @@ class GlancesFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
) )
except CannotConnect: except CannotConnect:
errors["base"] = "cannot_connect" errors["base"] = "cannot_connect"
except WrongVersion:
errors[CONF_VERSION] = "wrong_version"
return self.async_show_form( return self.async_show_form(
step_id="user", data_schema=DATA_SCHEMA, errors=errors step_id="user", data_schema=DATA_SCHEMA, errors=errors
@ -117,7 +113,3 @@ class GlancesOptionsFlowHandler(config_entries.OptionsFlow):
class CannotConnect(exceptions.HomeAssistantError): class CannotConnect(exceptions.HomeAssistantError):
"""Error to indicate we cannot connect.""" """Error to indicate we cannot connect."""
class WrongVersion(exceptions.HomeAssistantError):
"""Error to indicate the selected version is wrong."""

16
tests/components/glances/test_config_flow.py
View File

@ -75,22 +75,6 @@ async def test_form_cannot_connect(hass: HomeAssistant) -> None:
assert result["errors"] == {"base": "cannot_connect"} assert result["errors"] == {"base": "cannot_connect"}
async def test_form_wrong_version(hass: HomeAssistant) -> None:
"""Test to check if wrong version is entered."""
user_input = DEMO_USER_INPUT.copy()
user_input.update(version=1)
result = await hass.config_entries.flow.async_init(
glances.DOMAIN, context={"source": config_entries.SOURCE_USER}
)
result = await hass.config_entries.flow.async_configure(
result["flow_id"], user_input=user_input
)
assert result["type"] == "form"
assert result["errors"] == {"version": "wrong_version"}
async def test_form_already_configured(hass: HomeAssistant) -> None: async def test_form_already_configured(hass: HomeAssistant) -> None:
"""Test host is already configured.""" """Test host is already configured."""
entry = MockConfigEntry( entry = MockConfigEntry(