diff --git a/homeassistant/components/ipp/config_flow.py b/homeassistant/components/ipp/config_flow.py index 476756ddc61..feed7e7b528 100644 --- a/homeassistant/components/ipp/config_flow.py +++ b/homeassistant/components/ipp/config_flow.py @@ -73,7 +73,7 @@ class IPPFlowHandler(ConfigFlow, domain=DOMAIN): return self._show_setup_form({"base": "connection_upgrade"}) except (IPPConnectionError, IPPResponseError): _LOGGER.debug("IPP Connection/Response Error", exc_info=True) - return self._show_setup_form({"base": "connection_error"}) + return self._show_setup_form({"base": "cannot_connect"}) except IPPParseError: _LOGGER.debug("IPP Parse Error", exc_info=True) return self.async_abort(reason="parse_error") @@ -127,7 +127,7 @@ class IPPFlowHandler(ConfigFlow, domain=DOMAIN): return self.async_abort(reason="connection_upgrade") except (IPPConnectionError, IPPResponseError): _LOGGER.debug("IPP Connection/Response Error", exc_info=True) - return self.async_abort(reason="connection_error") + return self.async_abort(reason="cannot_connect") except IPPParseError: _LOGGER.debug("IPP Parse Error", exc_info=True) return self.async_abort(reason="parse_error") diff --git a/homeassistant/components/ipp/strings.json b/homeassistant/components/ipp/strings.json index d13d281cef3..b61c89f6df1 100644 --- a/homeassistant/components/ipp/strings.json +++ b/homeassistant/components/ipp/strings.json @@ -19,12 +19,12 @@ } }, "error": { - "connection_error": "[%key:common::config_flow::error::cannot_connect%]", + "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]", "connection_upgrade": "Failed to connect to printer. Please try again with SSL/TLS option checked." }, "abort": { "already_configured": "[%key:common::config_flow::abort::already_configured_device%]", - "connection_error": "[%key:common::config_flow::error::cannot_connect%]", + "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]", "connection_upgrade": "Failed to connect to printer due to connection upgrade being required.", "ipp_error": "Encountered IPP error.", "ipp_version_error": "IPP version not supported by printer.", diff --git a/tests/components/ipp/test_config_flow.py b/tests/components/ipp/test_config_flow.py index 19ee2f73231..24ead324243 100644 --- a/tests/components/ipp/test_config_flow.py +++ b/tests/components/ipp/test_config_flow.py @@ -65,7 +65,7 @@ async def test_connection_error( assert result["step_id"] == "user" assert result["type"] == RESULT_TYPE_FORM - assert result["errors"] == {"base": "connection_error"} + assert result["errors"] == {"base": "cannot_connect"} async def test_zeroconf_connection_error( @@ -82,7 +82,7 @@ async def test_zeroconf_connection_error( ) assert result["type"] == RESULT_TYPE_ABORT - assert result["reason"] == "connection_error" + assert result["reason"] == "cannot_connect" async def test_zeroconf_confirm_connection_error( @@ -97,7 +97,7 @@ async def test_zeroconf_confirm_connection_error( ) assert result["type"] == RESULT_TYPE_ABORT - assert result["reason"] == "connection_error" + assert result["reason"] == "cannot_connect" async def test_user_connection_upgrade_required(