(original) (raw)

# HG changeset patch # Parent 8d3fb1e767a0f31b75d641eec7d5ffb5e305099d diff --git a/Lib/test/test_queue.py b/Lib/test/test_queue.py --- a/Lib/test/test_queue.py +++ b/Lib/test/test_queue.py @@ -351,10 +351,17 @@ self.failing_queue_test(q) +test_cases = (QueueTest, LifoQueueTest, PriorityQueueTest, FailingQueueTest) + +def load_tests(loader, tests, pattern): + suite = unittest.TestSuite() + for test_class in test_cases: + tests = loader.loadTestsFromTestCase(test_class) + suite.addTests(tests) + return suite + def test_main(): - support.run_unittest(QueueTest, LifoQueueTest, PriorityQueueTest, - FailingQueueTest) - + support.run_unittest(*test_cases) if __name__ == "__main__": test_main() diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -4642,7 +4642,7 @@ socket.setdefaulttimeout(t) -def test_main(): +def test_cases(): tests = [GeneralModuleTests, BasicTCPTest, TCPCloserTest, TCPTimeoutTest, TestExceptions, BufferIOTest, BasicTCPTest2, BasicUDPTest, UDPTimeoutTest ] @@ -4699,9 +4699,18 @@ InterruptedRecvTimeoutTest, InterruptedSendTimeoutTest, ]) - + return tests + +def load_tests(loader, tests, pattern): + suite = unittest.TestSuite() + for test_class in test_cases(): + tests = loader.loadTestsFromTestCase(test_class) + suite.addTests(tests) + return suite + +def test_main(): thread_info = support.threading_setup() - support.run_unittest(*tests) + support.run_unittest(*test_cases()) support.threading_cleanup(*thread_info) if __name__ == "__main__": diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -786,16 +786,20 @@ class BarrierTests(lock_tests.BarrierTests): barriertype = staticmethod(threading.Barrier) +test_cases = (LockTests, PyRLockTests, CRLockTests, EventTests, + ConditionAsRLockTests, ConditionTests, SemaphoreTests, + BoundedSemaphoreTests, ThreadTests, ThreadJoinOnShutdown, + ThreadingExceptionTests, BarrierTests) + +def load_tests(loader, tests, pattern): + suite = unittest.TestSuite() + for test_class in test_cases: + tests = loader.loadTestsFromTestCase(test_class) + suite.addTests(tests) + return suite def test_main(): - test.support.run_unittest(LockTests, PyRLockTests, CRLockTests, EventTests, - ConditionAsRLockTests, ConditionTests, - SemaphoreTests, BoundedSemaphoreTests, - ThreadTests, - ThreadJoinOnShutdown, - ThreadingExceptionTests, - BarrierTests, - ) + test.support.run_unittest(*test_cases) if __name__ == "__main__": test_main()