merge heads

1 files changed, 3 insertions, 11 deletions

diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 65b36de9e1..a396331011 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -1099,16 +1099,8 @@ class PendingSignalsTests(unittest.TestCase):
                                 (exitcode, stdout))
 
 
-def test_main():
-    try:
-        support.run_unittest(GenericTests, PosixTests, InterProcessSignalTests,
-                             WakeupFDTests, WakeupSignalTests,
-                             WakeupSocketSignalTests,
-                             SiginterruptTest, ItimerTest, WindowsSignalTests,
-                             PendingSignalsTests)
-    finally:
-        support.reap_children()
-
+def tearDownModule():
+    support.reap_children()
 
 if __name__ == "__main__":
-    test_main()
+    unittest.main()