summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-05-08 11:16:33 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2013-05-08 11:16:33 +0300
commitd62a5143867096e1eeeca82b8db229dd27e94569 (patch)
tree21dcad88ab80439282d1d1d421449f291fe47038
parent0fbdf261582b16e409ae929bdf9107ae9fe817fb (diff)
parent6bcc0f1b5161adf0773ebeba77f1d7662aad4f0e (diff)
downloadcpython-git-d62a5143867096e1eeeca82b8db229dd27e94569.tar.gz
#17877: merge with 3.3.
-rw-r--r--Lib/test/test_email/test_utils.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py
index 622ef3a9c9..e507dd2c03 100644
--- a/Lib/test/test_email/test_utils.py
+++ b/Lib/test/test_email/test_utils.py
@@ -4,6 +4,7 @@ import test.support
import time
import unittest
import sys
+import os.path
class DateTimeTests(unittest.TestCase):
@@ -123,6 +124,9 @@ class LocaltimeTests(unittest.TestCase):
# XXX: Need a more robust test for Olson's tzdata
@unittest.skipIf(sys.platform.startswith('win'),
"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')
def test_variable_tzname(self):
t0 = datetime.datetime(1984, 1, 1, tzinfo=datetime.timezone.utc)