gh-109017: Use non alternate name for Kyiv

jspricke · jspricke · commit 43a38cf7257b · 2023-09-11T06:41:52.000+02:00
tzdata provides Kiev as an alternative to Kyiv: https://sources.debian.org/src/tzdata/2023c-10/backward/?hl=314#L314 But Debian moved it to the tzdata-legacy package breaking the test: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050530 This patch switches to the name provided by tzdata. Also check that the new name is actually available.
diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py
@@ -145,10 +145,10 @@ def test_localtime_epoch_notz_daylight_false(self):
     # XXX: Need a more robust test for Olson's tzdata
     @unittest.skipIf(sys.platform.startswith('win'),
                      "Windows does not use Olson's TZ database")
-    @unittest.skipUnless(os.path.exists('/usr/share/zoneinfo') or
-                         os.path.exists('/usr/lib/zoneinfo'),
-                         "Can't find the Olson's TZ database")
-    @test.support.run_with_tz('Europe/Kiev')
+    @unittest.skipUnless(os.path.exists('/usr/share/zoneinfo/Europe/Kyiv') or
+                         os.path.exists('/usr/lib/zoneinfo/Europe/Kyiv'),
+                         "Can't find a recent Olson's TZ 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)
