Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix obscure failures of datetime-related tests due to the datetime tests failing to restore the system state completely after testing the pure-Python versions.

This commit is contained in:
Georg Brandl 2012-02-20 23:37:36 +01:00
parent 09562b4330
commit e5a0e0a75f
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/datetimetester.py
View File

@ -1780,8 +1780,6 @@ class TestDateTime(TestDate):
self.assertTrue(abs(from_timestamp - from_now) <= tolerance) self.assertTrue(abs(from_timestamp - from_now) <= tolerance)
def test_strptime(self): def test_strptime(self):
import _strptime
string = '2004-12-01 13:02:47.197' string = '2004-12-01 13:02:47.197'
format = '%Y-%m-%d %H:%M:%S.%f' format = '%Y-%m-%d %H:%M:%S.%f'
expected = _strptime._strptime_datetime(self.theclass, string, format) expected = _strptime._strptime_datetime(self.theclass, string, format)

40
Lib/test/test_datetime.py
View File

@ -1,7 +1,9 @@
import unittest import unittest
import sys import sys
from test.support import import_fresh_module, run_unittest from test.support import import_fresh_module, run_unittest
TESTS = 'test.datetimetester' TESTS = 'test.datetimetester'
# XXX: import_fresh_module() is supposed to leave sys.module cache untouched, # XXX: import_fresh_module() is supposed to leave sys.module cache untouched,
# XXX: but it does not, so we have to save and restore it ourselves. # XXX: but it does not, so we have to save and restore it ourselves.
save_sys_modules = sys.modules.copy() save_sys_modules = sys.modules.copy()
@ -15,28 +17,32 @@ finally:
sys.modules.update(save_sys_modules) sys.modules.update(save_sys_modules)
test_modules = [pure_tests, fast_tests] test_modules = [pure_tests, fast_tests]
test_suffixes = ["_Pure", "_Fast"] test_suffixes = ["_Pure", "_Fast"]
# XXX(gb) First run all the _Pure tests, then all the _Fast tests. You might
# not believe this, but in spite of all the sys.modules trickery running a _Pure
# test last will leave a mix of pure and native datetime stuff lying around.
test_classes = []
for module, suffix in zip(test_modules, test_suffixes): for module, suffix in zip(test_modules, test_suffixes):
for name, cls in module.__dict__.items(): for name, cls in module.__dict__.items():
if isinstance(cls, type) and issubclass(cls, unittest.TestCase): if not (isinstance(cls, type) and issubclass(cls, unittest.TestCase)):
name += suffix continue
cls.__name__ = name cls.__name__ = name + suffix
globals()[name] = cls @classmethod
def setUp(self, module=module, setup=cls.setUp): def setUpClass(cls_, module=module):
self._save_sys_modules = sys.modules.copy() cls_._save_sys_modules = sys.modules.copy()
sys.modules[TESTS] = module sys.modules[TESTS] = module
sys.modules['datetime'] = module.datetime_module sys.modules['datetime'] = module.datetime_module
sys.modules['_strptime'] = module._strptime sys.modules['_strptime'] = module._strptime
setup(self) @classmethod
def tearDown(self, teardown=cls.tearDown): def tearDownClass(cls_):
teardown(self) sys.modules.clear()
sys.modules.clear() sys.modules.update(cls_._save_sys_modules)
sys.modules.update(self._save_sys_modules) cls.setUpClass = setUpClass
cls.setUp = setUp cls.tearDownClass = tearDownClass
cls.tearDown = tearDown test_classes.append(cls)
def test_main(): def test_main():
run_unittest(__name__) run_unittest(*test_classes)
if __name__ == "__main__": if __name__ == "__main__":
test_main() test_main()