From 5f9d46205cbd027929ec0a21070080dd7c5b42a0 Mon Sep 17 00:00:00 2001 From: Malte Franken Date: Thu, 22 Feb 2024 22:58:54 +1100 Subject: [PATCH] Bump georss-qld-bushfire-alert-client to 0.7 (#111075) * bump georss-qld-bushfire-alert-client to 0.7 * fix tests --- .../components/qld_bushfire/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- .../qld_bushfire/test_geo_location.py | 18 +++++++++++------- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/homeassistant/components/qld_bushfire/manifest.json b/homeassistant/components/qld_bushfire/manifest.json index 5e7d9948309..94ccbbd4c18 100644 --- a/homeassistant/components/qld_bushfire/manifest.json +++ b/homeassistant/components/qld_bushfire/manifest.json @@ -6,5 +6,5 @@ "integration_type": "service", "iot_class": "cloud_polling", "loggers": ["georss_qld_bushfire_alert_client"], - "requirements": ["georss-qld-bushfire-alert-client==0.5"] + "requirements": ["georss-qld-bushfire-alert-client==0.7"] } diff --git a/requirements_all.txt b/requirements_all.txt index 160f77406b9..49b36b9d6cd 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -923,7 +923,7 @@ georss-generic-client==0.8 georss-ign-sismologia-client==0.8 # homeassistant.components.qld_bushfire -georss-qld-bushfire-alert-client==0.5 +georss-qld-bushfire-alert-client==0.7 # homeassistant.components.dlna_dmr # homeassistant.components.kef diff --git a/requirements_test_all.txt b/requirements_test_all.txt index b8f28f8fee0..4523e514615 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -749,7 +749,7 @@ georss-generic-client==0.8 georss-ign-sismologia-client==0.8 # homeassistant.components.qld_bushfire -georss-qld-bushfire-alert-client==0.5 +georss-qld-bushfire-alert-client==0.7 # homeassistant.components.dlna_dmr # homeassistant.components.kef diff --git a/tests/components/qld_bushfire/test_geo_location.py b/tests/components/qld_bushfire/test_geo_location.py index 5a9821dd52d..9cd12ea0447 100644 --- a/tests/components/qld_bushfire/test_geo_location.py +++ b/tests/components/qld_bushfire/test_geo_location.py @@ -3,6 +3,7 @@ import datetime from unittest.mock import MagicMock, call, patch from freezegun.api import FrozenDateTimeFactory +from georss_qld_bushfire_alert_client import QldBushfireAlertFeed from homeassistant.components import geo_location from homeassistant.components.geo_location import ATTR_SOURCE @@ -93,8 +94,8 @@ async def test_setup(hass: HomeAssistant, freezer: FrozenDateTimeFactory) -> Non utcnow = dt_util.utcnow() freezer.move_to(utcnow) - with patch("georss_qld_bushfire_alert_client.QldBushfireAlertFeed") as mock_feed: - mock_feed.return_value.update.return_value = ( + with patch("georss_client.feed.GeoRssFeed.update") as mock_feed_update: + mock_feed_update.return_value = ( "OK", [mock_entry_1, mock_entry_2, mock_entry_3], ) @@ -162,7 +163,7 @@ async def test_setup(hass: HomeAssistant, freezer: FrozenDateTimeFactory) -> Non # Simulate an update - one existing, one new entry, # one outdated entry - mock_feed.return_value.update.return_value = ( + mock_feed_update.return_value = ( "OK", [mock_entry_1, mock_entry_4, mock_entry_3], ) @@ -174,7 +175,7 @@ async def test_setup(hass: HomeAssistant, freezer: FrozenDateTimeFactory) -> Non # Simulate an update - empty data, but successful update, # so no changes to entities. - mock_feed.return_value.update.return_value = "OK_NO_DATA", None + mock_feed_update.return_value = "OK_NO_DATA", None async_fire_time_changed(hass, utcnow + 2 * SCAN_INTERVAL) await hass.async_block_till_done() @@ -182,7 +183,7 @@ async def test_setup(hass: HomeAssistant, freezer: FrozenDateTimeFactory) -> Non assert len(all_states) == 3 # Simulate an update - empty data, removes all entities - mock_feed.return_value.update.return_value = "ERROR", None + mock_feed_update.return_value = "ERROR", None async_fire_time_changed(hass, utcnow + 3 * SCAN_INTERVAL) await hass.async_block_till_done() @@ -197,8 +198,11 @@ async def test_setup_with_custom_location(hass: HomeAssistant) -> None: "1234", "Title 1", 20.5, (38.1, -3.1), category="Category 1" ) - with patch("georss_qld_bushfire_alert_client.QldBushfireAlertFeed") as mock_feed: - mock_feed.return_value.update.return_value = "OK", [mock_entry_1] + with patch( + "georss_qld_bushfire_alert_client.feed_manager.QldBushfireAlertFeed", + wraps=QldBushfireAlertFeed, + ) as mock_feed, patch("georss_client.feed.GeoRssFeed.update") as mock_feed_update: + mock_feed_update.return_value = "OK", [mock_entry_1] with assert_setup_component(1, geo_location.DOMAIN): assert await async_setup_component(