From 3712f6f3345fe7da63adb5f1844f1795be74ebdd Mon Sep 17 00:00:00 2001 From: LaFeev Date: Mon, 8 Sep 2025 10:31:48 -0500 Subject: [PATCH] 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 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/test_apprise_utils.py b/tests/test_apprise_utils.py index 6d5518e0..b9c84be5 100644 --- a/tests/test_apprise_utils.py +++ b/tests/test_apprise_utils.py @@ -3253,8 +3253,18 @@ 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 not isinstance(utils.time.zoneinfo("Cordoba"), 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 isinstance(utils.time.zoneinfo("Cordoba"), 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