diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2016-07-25 00:36:55 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2016-07-25 00:36:55 (GMT) |
| commit | 95f7b9fcaca03d442aa2f26fd79f093cbcbc7003 (patch) | |
| tree | 25f37dd5c578b6206aecc28f1a59ad526da5de47 /Lib/test | |
| parent | c74fb9c6c5786ce3467a17a8c540e61ac925f645 (diff) | |
| download | cpython-95f7b9fcaca03d442aa2f26fd79f093cbcbc7003.zip cpython-95f7b9fcaca03d442aa2f26fd79f093cbcbc7003.tar.gz cpython-95f7b9fcaca03d442aa2f26fd79f093cbcbc7003.tar.bz2 | |
Issue 24773: Make zoneinfo tests more robust. (reapply)
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/datetimetester.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index 0abba44..78f0a87 100644 --- 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: |