From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 12 Jan 2024 12:00:17 +0000 (+0100)
Subject: [3.12] gh-113027: Fix test_variable_tzname in test_email (GH-113821) (GH-113831)
X-Git-Tag: v3.12.2~190
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8046eb0cc89a66b93616501c1d7d199a59e998d4;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-113027: Fix test_variable_tzname in test_email (GH-113821) (GH-113831)

Determine the support of the Kyiv timezone by checking the result of
astimezone() which uses the system tz database and not the one
populated by zoneinfo.
(cherry picked from commit 931d7e052e22aa01e18fcc67ed71b6ea305aff71)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py
index c9d973df0a21..d04b3909efa6 100644
--- a/Lib/test/test_email/test_utils.py
+++ b/Lib/test/test_email/test_utils.py
@@ -143,12 +143,12 @@ class LocaltimeTests(unittest.TestCase):
         t2 = utils.localtime(t0.replace(tzinfo=None))
         self.assertEqual(t1, t2)
 
-    @unittest.skipUnless("Europe/Kyiv" in zoneinfo.available_timezones(),
-                         "Can't find a Kyiv timezone database")
     @test.support.run_with_tz('Europe/Kyiv')
     def test_variable_tzname(self):
         t0 = datetime.datetime(1984, 1, 1, tzinfo=datetime.timezone.utc)
         t1 = utils.localtime(t0)
+        if t1.tzname() in ('Europe', 'UTC'):
+            self.skipTest("Can't find a Kyiv timezone database")
         self.assertEqual(t1.tzname(), 'MSK')
         t0 = datetime.datetime(1994, 1, 1, tzinfo=datetime.timezone.utc)
         t1 = utils.localtime(t0)