Issue 24773: Make zoneinfo tests more robust. (reapply)

diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index 0abba447e4ddf0d8eded8ddcb21c94a9058b6651..78f0a8726fa4cc88de8f41edefb7696775f03b96 100644 (file)
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -4677,7 +4677,10 @@ class ZoneInfoTest(unittest.TestCase):
     def setUp(self):
         if sys.platform == "win32":
             self.skipTest("Skipping zoneinfo tests on Windows")
-        self.tz = ZoneInfo.fromname(self.zonename)
+        try:
+            self.tz = ZoneInfo.fromname(self.zonename)
+        except FileNotFoundError as err:
+            self.skipTest("Skipping %s: %s" % (self.zonename, err))
 
     def assertEquivDatetimes(self, a, b):
         self.assertEqual((a.replace(tzinfo=None), a.fold, id(a.tzinfo)),
@@ -4738,7 +4741,7 @@ class ZoneInfoTest(unittest.TestCase):
             # civil time was generally not solar time in those years.
                 self.zonename.startswith('right/')):
             self.skipTest("Skipping %s" % self.zonename)
-        tz = ZoneInfo.fromname(self.zonename)
+        tz = self.tz
         TZ = os.environ.get('TZ')
         os.environ['TZ'] = self.zonename
         try: