]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] gh-113027: Fix test_variable_tzname in test_email (GH-113821) (GH-113831)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Fri, 12 Jan 2024 12:00:17 +0000 (13:00 +0100)
committerGitHub <noreply@github.com>
Fri, 12 Jan 2024 12:00:17 +0000 (12:00 +0000)
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>
Lib/test/test_email/test_utils.py

index c9d973df0a2192a98259c6f49cedd8a9aa217cfb..d04b3909efa643816da3f03971e6c4f8ebbd2da2 100644 (file)
@@ -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)