From 6645cb2637fc1c26e9c1ebed1ce4dec74ca9eb99 Mon Sep 17 00:00:00 2001 From: Glenn Waters Date: Mon, 26 Oct 2020 05:36:28 -0400 Subject: [PATCH] Cleanup log style and tests for ElkM1 (#42353) --- homeassistant/components/elkm1/__init__.py | 6 +++--- tests/components/elkm1/test_config_flow.py | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/homeassistant/components/elkm1/__init__.py b/homeassistant/components/elkm1/__init__.py index 28c75f9c2ea..e33e1722edf 100644 --- a/homeassistant/components/elkm1/__init__.py +++ b/homeassistant/components/elkm1/__init__.py @@ -313,10 +313,10 @@ async def async_wait_for_elk_to_sync(elk, timeout, conf_host): success = succeeded if succeeded: - _LOGGER.info("ElkM1 login succeeded.") + _LOGGER.debug("ElkM1 login succeeded") else: elk.disconnect() - _LOGGER.error("ElkM1 login failed; invalid username or password.") + _LOGGER.error("ElkM1 login failed; invalid username or password") event.set() def sync_complete(): @@ -332,7 +332,7 @@ async def async_wait_for_elk_to_sync(elk, timeout, conf_host): except asyncio.TimeoutError: _LOGGER.error( "Timed out after %d seconds while trying to sync with ElkM1 at %s", - SYNC_TIMEOUT, + timeout, conf_host, ) elk.disconnect() diff --git a/tests/components/elkm1/test_config_flow.py b/tests/components/elkm1/test_config_flow.py index fdb4c63499c..346d0b65ad2 100644 --- a/tests/components/elkm1/test_config_flow.py +++ b/tests/components/elkm1/test_config_flow.py @@ -163,8 +163,6 @@ async def test_form_user_with_serial_elk(hass): async def test_form_cannot_connect(hass): """Test we handle cannot connect error.""" - from asyncio import TimeoutError - result = await hass.config_entries.flow.async_init( DOMAIN, context={"source": config_entries.SOURCE_USER} ) @@ -175,8 +173,8 @@ async def test_form_cannot_connect(hass): "homeassistant.components.elkm1.config_flow.elkm1.Elk", return_value=mocked_elk, ), patch( - "homeassistant.components.elkm1.async_timeout.timeout", - side_effect=TimeoutError, + "homeassistant.components.elkm1.config_flow.VALIDATE_TIMEOUT", + 0, ): result2 = await hass.config_entries.flow.async_configure( result["flow_id"],