#17877: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-05-08 11:16:33 +03:00
commit d62a514386
1 changed files with 4 additions and 0 deletions

View File

@ -4,6 +4,7 @@ import test.support
import time import time
import unittest import unittest
import sys import sys
import os.path
class DateTimeTests(unittest.TestCase): class DateTimeTests(unittest.TestCase):
@ -123,6 +124,9 @@ class LocaltimeTests(unittest.TestCase):
# XXX: Need a more robust test for Olson's tzdata # XXX: Need a more robust test for Olson's tzdata
@unittest.skipIf(sys.platform.startswith('win'), @unittest.skipIf(sys.platform.startswith('win'),
"Windows does not use Olson's TZ database") "Windows does not use Olson's TZ database")
@unittest.skipUnless(os.path.exists('/usr/share/zoneinfo') or
os.path.exists('/usr/lib/zoneinfo'),
"Can't find the Olson's TZ database")
@test.support.run_with_tz('Europe/Kiev') @test.support.run_with_tz('Europe/Kiev')
def test_variable_tzname(self): def test_variable_tzname(self):
t0 = datetime.datetime(1984, 1, 1, tzinfo=datetime.timezone.utc) t0 = datetime.datetime(1984, 1, 1, tzinfo=datetime.timezone.utc)