mirror of
https://github.com/python/cpython.git
synced 2025-10-17 12:18:23 +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
|
@ -658,42 +658,34 @@ Set(['Jack', 'Jane', 'Janice', 'John', 'Marvin', 'Sam', 'Zack'])
|
|||
|
||||
#==============================================================================
|
||||
|
||||
def makeAllTests():
|
||||
suite = unittest.TestSuite()
|
||||
for klass in (TestSetOfSets,
|
||||
TestExceptionPropagation,
|
||||
TestBasicOpsEmpty,
|
||||
TestBasicOpsSingleton,
|
||||
TestBasicOpsTuple,
|
||||
TestBasicOpsTriple,
|
||||
TestBinaryOps,
|
||||
TestUpdateOps,
|
||||
TestMutate,
|
||||
TestSubsetEqualEmpty,
|
||||
TestSubsetEqualNonEmpty,
|
||||
TestSubsetEmptyNonEmpty,
|
||||
TestSubsetPartial,
|
||||
TestSubsetNonOverlap,
|
||||
TestOnlySetsNumeric,
|
||||
TestOnlySetsDict,
|
||||
TestOnlySetsOperator,
|
||||
TestCopyingEmpty,
|
||||
TestCopyingSingleton,
|
||||
TestCopyingTriple,
|
||||
TestCopyingTuple,
|
||||
TestCopyingNested,
|
||||
):
|
||||
suite.addTest(unittest.makeSuite(klass))
|
||||
return suite
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
__test__ = {'libreftest' : libreftest}
|
||||
|
||||
def test_main(verbose=None):
|
||||
from test import test_sets
|
||||
suite = makeAllTests()
|
||||
test_support.run_suite(suite)
|
||||
test_support.run_unittest(
|
||||
TestSetOfSets,
|
||||
TestExceptionPropagation,
|
||||
TestBasicOpsEmpty,
|
||||
TestBasicOpsSingleton,
|
||||
TestBasicOpsTuple,
|
||||
TestBasicOpsTriple,
|
||||
TestBinaryOps,
|
||||
TestUpdateOps,
|
||||
TestMutate,
|
||||
TestSubsetEqualEmpty,
|
||||
TestSubsetEqualNonEmpty,
|
||||
TestSubsetEmptyNonEmpty,
|
||||
TestSubsetPartial,
|
||||
TestSubsetNonOverlap,
|
||||
TestOnlySetsNumeric,
|
||||
TestOnlySetsDict,
|
||||
TestOnlySetsOperator,
|
||||
TestCopyingEmpty,
|
||||
TestCopyingSingleton,
|
||||
TestCopyingTriple,
|
||||
TestCopyingTuple,
|
||||
TestCopyingNested
|
||||
)
|
||||
test_support.run_doctest(test_sets, verbose)
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue