Kaydet (Commit) 9dcbbea8 authored tarafından Raymond Hettinger's avatar Raymond Hettinger

Factor out common boilerplate for test_support

üst c23fb774
...@@ -192,24 +192,14 @@ a priority queue (example courtesy of Fredrik Lundh): ...@@ -192,24 +192,14 @@ a priority queue (example courtesy of Fredrik Lundh):
""" """
#==============================================================================
def makeAllTests():
suite = unittest.TestSuite()
for klass in (TestBisect,
TestInsort
):
suite.addTest(unittest.makeSuite(klass))
return suite
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
__test__ = {'libreftest' : libreftest} __test__ = {'libreftest' : libreftest}
def test_main(verbose=None): def test_main(verbose=None):
from test import test_bisect from test import test_bisect
suite = makeAllTests() test_support.run_classtests(TestBisect,
test_support.run_suite(suite) TestInsort)
test_support.run_doctest(test_bisect, verbose) test_support.run_doctest(test_bisect, verbose)
if __name__ == "__main__": if __name__ == "__main__":
......
...@@ -331,9 +331,7 @@ class BoolTest(unittest.TestCase): ...@@ -331,9 +331,7 @@ class BoolTest(unittest.TestCase):
self.assertEqual(cPickle.dumps(False, True), "I00\n.") self.assertEqual(cPickle.dumps(False, True), "I00\n.")
def test_main(): def test_main():
suite = unittest.TestSuite() test_support.run_classtests(BoolTest)
suite.addTest(unittest.makeSuite(BoolTest))
test_support.run_suite(suite)
if __name__ == "__main__": if __name__ == "__main__":
test_main() test_main()
......
...@@ -9,7 +9,7 @@ import warnings ...@@ -9,7 +9,7 @@ import warnings
warnings.filterwarnings("ignore", "tempnam", RuntimeWarning, __name__) warnings.filterwarnings("ignore", "tempnam", RuntimeWarning, __name__)
warnings.filterwarnings("ignore", "tmpnam", RuntimeWarning, __name__) warnings.filterwarnings("ignore", "tmpnam", RuntimeWarning, __name__)
from test.test_support import TESTFN, run_suite from test.test_support import TESTFN, run_classtests
class TemporaryFileTests(unittest.TestCase): class TemporaryFileTests(unittest.TestCase):
def setUp(self): def setUp(self):
...@@ -282,14 +282,10 @@ class WalkTests(unittest.TestCase): ...@@ -282,14 +282,10 @@ class WalkTests(unittest.TestCase):
os.rmdir(TESTFN) os.rmdir(TESTFN)
def test_main(): def test_main():
suite = unittest.TestSuite() run_classtests(TemporaryFileTests,
for cls in (TemporaryFileTests, StatAttributeTests,
StatAttributeTests, EnvironTests,
EnvironTests, WalkTests)
WalkTests,
):
suite.addTest(unittest.makeSuite(cls))
run_suite(suite)
if __name__ == "__main__": if __name__ == "__main__":
test_main() test_main()
...@@ -233,6 +233,12 @@ def run_unittest(testclass): ...@@ -233,6 +233,12 @@ def run_unittest(testclass):
"""Run tests from a unittest.TestCase-derived class.""" """Run tests from a unittest.TestCase-derived class."""
run_suite(unittest.makeSuite(testclass), testclass) run_suite(unittest.makeSuite(testclass), testclass)
def run_classtests(*classnames):
suite = unittest.TestSuite()
for cls in classnames:
suite.addTest(unittest.makeSuite(cls))
run_suite(suite)
#======================================================================= #=======================================================================
# doctest driver. # doctest driver.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment