Revert "bpo-45229: Make datetime tests discoverable (GH-28615). (GH-28645)" (GH-28660)

This reverts commit 993a130d3a.
This commit is contained in:
Łukasz Langa 2021-09-30 22:23:32 +02:00 committed by GitHub
parent 993a130d3a
commit 2cf76cf4cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,29 +1,28 @@
import unittest import unittest
import sys import sys
from test.support import import_fresh_module from test.support import import_fresh_module, run_unittest
TESTS = 'test.datetimetester' TESTS = 'test.datetimetester'
def load_tests(loader, tests, pattern): try:
try:
pure_tests = import_fresh_module(TESTS, fresh=['datetime', '_strptime'], pure_tests = import_fresh_module(TESTS, fresh=['datetime', '_strptime'],
blocked=['_datetime']) blocked=['_datetime'])
fast_tests = import_fresh_module(TESTS, fresh=['datetime', fast_tests = import_fresh_module(TESTS, fresh=['datetime',
'_datetime', '_strptime']) '_datetime', '_strptime'])
finally: finally:
# 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 cleanup ourselves. # XXX: but it does not, so we have to cleanup ourselves.
for modname in ['datetime', '_datetime', '_strptime']: for modname in ['datetime', '_datetime', '_strptime']:
sys.modules.pop(modname, None) sys.modules.pop(modname, None)
test_modules = [pure_tests, fast_tests]
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.
all_test_classes = []
test_modules = [pure_tests, fast_tests] for module, suffix in zip(test_modules, test_suffixes):
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.
for module, suffix in zip(test_modules, test_suffixes):
test_classes = [] test_classes = []
for name, cls in module.__dict__.items(): for name, cls in module.__dict__.items():
if not isinstance(cls, type): if not isinstance(cls, type):
@ -49,9 +48,10 @@ def load_tests(loader, tests, pattern):
sys.modules.update(cls_._save_sys_modules) sys.modules.update(cls_._save_sys_modules)
cls.setUpClass = setUpClass cls.setUpClass = setUpClass
cls.tearDownClass = tearDownClass cls.tearDownClass = tearDownClass
tests.addTests(loader.loadTestsFromTestCase(cls)) all_test_classes.extend(test_classes)
return tests
def test_main():
run_unittest(*all_test_classes)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() test_main()