diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2012-01-25 02:00:57 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-01-25 02:00:57 (GMT) |
commit | dd21f68963c2b17324b6018dbbf1b32b6e88f2c2 (patch) | |
tree | d29ddbed1e580054967d84495ee5f624568080d2 /Lib | |
parent | 05f29b7a3aabc89000cce21d7bfec368f9ba5a26 (diff) | |
download | cpython-dd21f68963c2b17324b6018dbbf1b32b6e88f2c2.zip cpython-dd21f68963c2b17324b6018dbbf1b32b6e88f2c2.tar.gz cpython-dd21f68963c2b17324b6018dbbf1b32b6e88f2c2.tar.bz2 |
Port remaining test fixes, and fix test_importlib too.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/importlib/test/source/test_file_loader.py | 10 | ||||
-rw-r--r-- | Lib/test/test_import.py | 5 |
2 files changed, 14 insertions, 1 deletions
diff --git a/Lib/importlib/test/source/test_file_loader.py b/Lib/importlib/test/source/test_file_loader.py index 89990be..912e6c3 100644 --- a/Lib/importlib/test/source/test_file_loader.py +++ b/Lib/importlib/test/source/test_file_loader.py @@ -4,6 +4,7 @@ from .. import abc from .. import util from . import util as source_util +import errno import imp import marshal import os @@ -136,7 +137,14 @@ class SimpleTest(unittest.TestCase): compiled = imp.cache_from_source(source) with open(source, 'w') as f: f.write("x = 5") - os.utime(source, (2 ** 33, 2 ** 33)) + try: + os.utime(source, (2 ** 33, 2 ** 33)) + except OverflowError: + self.skipTest("cannot set modification time to large integer") + except OSError as e: + if e.errno != getattr(errno, 'EOVERFLOW', None): + raise + self.skipTest("cannot set modification time to large integer ({})".format(e)) loader = _bootstrap._SourceFileLoader('_temp', mapping['_temp']) mod = loader.load_module('_temp') # Sanity checks. diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py index 95b90b8..3110635 100644 --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -11,6 +11,7 @@ import stat import sys import unittest import textwrap +import errno from test.support import ( EnvironmentVarGuard, TESTFN, check_warnings, forget, is_jython, @@ -323,6 +324,10 @@ class ImportTests(unittest.TestCase): os.utime(source, (2 ** 33, 2 ** 33)) except OverflowError: self.skipTest("cannot set modification time to large integer") + except OSError as e: + if e.errno != getattr(errno, 'EOVERFLOW', None): + raise + self.skipTest("cannot set modification time to large integer ({})".format(e)) __import__(TESTFN) # The pyc file was created. os.stat(compiled) |