[Python-checkins] cpython (merge 3.2 -> default): Merge

[antoine.pitrou]

http://hg.python.org/cpython/rev/d825316b73d0
changeset:   68760:d825316b73d0
parent:      68757:c70d252135da
parent:      68759:adbdb3e74461
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Mar 20 17:42:55 2011 +0100
summary:
  Merge

files:
  

diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -1,4 +1,4 @@
-from test.support import verbose, run_unittest, import_module
+from test.support import verbose, run_unittest, import_module, reap_children
 
 #Skip these tests if either fcntl or termios is not available
 fcntl = import_module('fcntl')
@@ -195,7 +195,10 @@
         # pty.fork() passed.
 
 def test_main(verbose=None):
-    run_unittest(PtyTest)
+    try:
+        run_unittest(PtyTest)
+    finally:
+        reap_children()
 
 if __name__ == "__main__":
     test_main()
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -484,9 +484,12 @@
         self.assertEqual(self.hndl_called, True)
 
 def test_main():
-    support.run_unittest(BasicSignalTests, InterProcessSignalTests,
-                         WakeupSignalTests, SiginterruptTest,
-                         ItimerTest, WindowsSignalTests)
+    try:
+        support.run_unittest(BasicSignalTests, InterProcessSignalTests,
+                             WakeupSignalTests, SiginterruptTest,
+                             ItimerTest, WindowsSignalTests)
+    finally:
+        support.reap_children()
 
 
 if __name__ == "__main__":

-- 
Repository URL: http://hg.python.org/cpython