mirror of
https://github.com/python/cpython.git
synced 2025-10-09 08:31:26 +00:00
Combine the functionality of test_support.run_unittest()
and test_support.run_classtests() into run_unittest() and use it wherever possible. Also don't use "from test.test_support import ...", but "from test import test_support" in a few spots. From SF patch #662807.
This commit is contained in:
parent
90437c03f2
commit
21d3a32b99
63 changed files with 310 additions and 402 deletions
|
@ -1193,18 +1193,11 @@ class TestMatchAbbrev(BaseTest):
|
|||
"ambiguous option: --f (%s?)" % possibilities,
|
||||
funcargs=[s, wordmap])
|
||||
|
||||
def _testclasses():
|
||||
mod = sys.modules[__name__]
|
||||
return [getattr(mod, name) for name in dir(mod) if name.startswith('Test')]
|
||||
|
||||
def suite():
|
||||
suite = unittest.TestSuite()
|
||||
for testclass in _testclasses():
|
||||
suite.addTest(unittest.makeSuite(testclass))
|
||||
return suite
|
||||
|
||||
def test_main():
|
||||
test_support.run_suite(suite())
|
||||
mod = sys.modules[__name__]
|
||||
test_support.run_unittest(
|
||||
*[getattr(mod, name) for name in dir(mod) if name.startswith('Test')]
|
||||
)
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue