mirror of
https://github.com/python/cpython.git
synced 2025-08-30 05:35:08 +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
|
@ -683,17 +683,18 @@ class SmallBufferedFileObjectClassTestCase(FileObjectClassTestCase):
|
|||
bufsize = 2 # Exercise the buffering code
|
||||
|
||||
def test_main():
|
||||
suite = unittest.TestSuite()
|
||||
suite.addTest(unittest.makeSuite(GeneralModuleTests))
|
||||
suite.addTest(unittest.makeSuite(BasicTCPTest))
|
||||
tests = [ GeneralModuleTests, BasicTCPTest ]
|
||||
if sys.platform != 'mac':
|
||||
suite.addTest(unittest.makeSuite(BasicUDPTest))
|
||||
suite.addTest(unittest.makeSuite(NonBlockingTCPTests))
|
||||
suite.addTest(unittest.makeSuite(FileObjectClassTestCase))
|
||||
suite.addTest(unittest.makeSuite(UnbufferedFileObjectClassTestCase))
|
||||
suite.addTest(unittest.makeSuite(LineBufferedFileObjectClassTestCase))
|
||||
suite.addTest(unittest.makeSuite(SmallBufferedFileObjectClassTestCase))
|
||||
test_support.run_suite(suite)
|
||||
tests.append(BasicUDPTest)
|
||||
|
||||
tests.extend([
|
||||
NonBlockingTCPTests,
|
||||
FileObjectClassTestCase,
|
||||
UnbufferedFileObjectClassTestCase,
|
||||
LineBufferedFileObjectClassTestCase,
|
||||
SmallBufferedFileObjectClassTestCase
|
||||
])
|
||||
test_support.run_unittest(*tests)
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue