From 1f37c215f641f5ddac39f405c576300cbc073512 Mon Sep 17 00:00:00 2001 From: Aaron Bach Date: Fri, 27 Aug 2021 16:00:17 -0600 Subject: [PATCH] Ensure ReCollect Waste starts up even if no future pickup is found (#55349) --- .../components/recollect_waste/config_flow.py | 2 +- tests/components/recollect_waste/test_config_flow.py | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/recollect_waste/config_flow.py b/homeassistant/components/recollect_waste/config_flow.py index 92f94a314ee..5d6b66d8abd 100644 --- a/homeassistant/components/recollect_waste/config_flow.py +++ b/homeassistant/components/recollect_waste/config_flow.py @@ -59,7 +59,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): ) try: - await client.async_get_next_pickup_event() + await client.async_get_pickup_events() except RecollectError as err: LOGGER.error("Error during setup of integration: %s", err) return self.async_show_form( diff --git a/tests/components/recollect_waste/test_config_flow.py b/tests/components/recollect_waste/test_config_flow.py index cabcb1a8f9e..22f32983055 100644 --- a/tests/components/recollect_waste/test_config_flow.py +++ b/tests/components/recollect_waste/test_config_flow.py @@ -36,7 +36,7 @@ async def test_invalid_place_or_service_id(hass): conf = {CONF_PLACE_ID: "12345", CONF_SERVICE_ID: "12345"} with patch( - "aiorecollect.client.Client.async_get_next_pickup_event", + "aiorecollect.client.Client.async_get_pickup_events", side_effect=RecollectError, ): result = await hass.config_entries.flow.async_init( @@ -87,9 +87,7 @@ async def test_step_import(hass): with patch( "homeassistant.components.recollect_waste.async_setup_entry", return_value=True - ), patch( - "aiorecollect.client.Client.async_get_next_pickup_event", return_value=True - ): + ), patch("aiorecollect.client.Client.async_get_pickup_events", return_value=True): result = await hass.config_entries.flow.async_init( DOMAIN, context={"source": SOURCE_IMPORT}, data=conf ) @@ -105,9 +103,7 @@ async def test_step_user(hass): with patch( "homeassistant.components.recollect_waste.async_setup_entry", return_value=True - ), patch( - "aiorecollect.client.Client.async_get_next_pickup_event", return_value=True - ): + ), patch("aiorecollect.client.Client.async_get_pickup_events", return_value=True): result = await hass.config_entries.flow.async_init( DOMAIN, context={"source": SOURCE_USER}, data=conf )