From 181103d7ca29020453b17d6a2ddcba6d2e91e122 Mon Sep 17 00:00:00 2001 From: Aaron LaFevers Date: Tue, 30 Sep 2025 09:28:53 -0500 Subject: [PATCH] Fix test_time_zoneinfo edge case (#1411) * fix: available timezones in test_time_zoneinfo differ by system, update assertions to handle possible inclusion of obsolete IANA entries --- tests/test_apprise_utils.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/test_apprise_utils.py b/tests/test_apprise_utils.py index 6d5518e0..b146574d 100644 --- a/tests/test_apprise_utils.py +++ b/tests/test_apprise_utils.py @@ -3253,8 +3253,20 @@ def test_time_zoneinfo(): isinstance(tz, tzinfo) assert isinstance(utils.time.zoneinfo("Argentina/Cordoba"), tzinfo) assert utils.time.zoneinfo("Argentina/Cordoba").key == tz.key - assert isinstance(utils.time.zoneinfo("Cordoba"), tzinfo) - assert utils.time.zoneinfo("Cordoba").key == "America/Cordoba" + # "America/Cordoba" has been obsoleted by IANA in facor of + # "America/Argentina/Cordoba", however the IANA database + # instance used is system-dependent, so these tests have + # different results depending on the system running them + if utils.time.zoneinfo("Cordoba") is not None: + # the system has the obsolete "America/Cordoba" entry + assert isinstance(utils.time.zoneinfo("Cordoba"), tzinfo) + assert utils.time.zoneinfo("Cordoba").key == "America/Cordoba" + else: + assert utils.time.zoneinfo("Cordoba") is None + # the utils helper should still resolve this abbreviated (and + # lowercase) form + assert utils.time.zoneinfo("argentina/cordoba").key == \ + "America/Argentina/Cordoba" # Too ambiguous assert utils.time.zoneinfo("Argentina") is None