[Python-checkins] cpython: Issue 24773: Make zoneinfo tests more robust.

[alexander.belopolsky]

https://hg.python.org/cpython/rev/e72aab080165
changeset:   102433:e72aab080165
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Sat Jul 23 11:16:56 2016 -0400
summary:
  Issue 24773: Make zoneinfo tests more robust.

files:
  Lib/test/datetimetester.py |  7 +++++--
  1 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -4677,7 +4677,10 @@
     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 @@
             # 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:

-- 
Repository URL: https://hg.python.org/cpython