(original) (raw)

changeset: 102437:dca143512f6e user: Alexander Belopolsky alexander.belopolsky@gmail.com date: Sun Jul 24 20:36:55 2016 -0400 files: Lib/test/datetimetester.py description: Issue 24773: Make zoneinfo tests more robust. (reapply) diff -r 1ec47de72538 -r dca143512f6e Lib/test/datetimetester.py --- a/Lib/test/datetimetester.py Sun Jul 24 20:35:43 2016 -0400 +++ b/Lib/test/datetimetester.py Sun Jul 24 20:36:55 2016 -0400 @@ -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: /alexander.belopolsky@gmail.com