mirror of
https://github.com/python/cpython.git
synced 2025-08-31 05:58:33 +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
|
@ -6,7 +6,7 @@ import unittest
|
|||
from StringIO import StringIO
|
||||
import csv
|
||||
import gc
|
||||
from test.test_support import verbose
|
||||
from test import test_support
|
||||
|
||||
class Test_Csv(unittest.TestCase):
|
||||
"""
|
||||
|
@ -568,7 +568,7 @@ Stonecutters Seafood and Chop House, Lemont, IL, 12/19/02, Week Back
|
|||
self.assertEqual(dialect.skipinitialspace, False)
|
||||
|
||||
if not hasattr(sys, "gettotalrefcount"):
|
||||
if verbose: print "*** skipping leakage tests ***"
|
||||
if test_support.verbose: print "*** skipping leakage tests ***"
|
||||
else:
|
||||
class NUL:
|
||||
def write(s, *args):
|
||||
|
@ -640,15 +640,11 @@ else:
|
|||
# if writer leaks during write, last delta should be 5 or more
|
||||
self.assertEqual(delta < 5, True)
|
||||
|
||||
def _testclasses():
|
||||
def test_main():
|
||||
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
|
||||
test_support.run_unittest(
|
||||
*[getattr(mod, name) for name in dir(mod) if name.startswith('Test')]
|
||||
)
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main(defaultTest='suite')
|
||||
test_main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue