mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source
This commit is contained in:
Alexander Belopolsky 2016-07-24 20:36:55 -04:00
parent c74fb9c6c5
commit 95f7b9fcac
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/test/datetimetester.py
View file

@ -4677,7 +4677,10 @@ class ZoneInfoTest(unittest.TestCase):
def setUp(self): def setUp(self):
if sys.platform == "win32": if sys.platform == "win32":
self.skipTest("Skipping zoneinfo tests on Windows") 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): def assertEquivDatetimes(self, a, b):
self.assertEqual((a.replace(tzinfo=None), a.fold, id(a.tzinfo)), 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. # civil time was generally not solar time in those years.
self.zonename.startswith('right/')): self.zonename.startswith('right/')):
self.skipTest("Skipping %s" % self.zonename) self.skipTest("Skipping %s" % self.zonename)
tz = ZoneInfo.fromname(self.zonename) tz = self.tz
TZ = os.environ.get('TZ') TZ = os.environ.get('TZ')
os.environ['TZ'] = self.zonename os.environ['TZ'] = self.zonename
try: try: