Apply this change from 2.6. Hopefully it doesn't cause a conflict.
I really want to test the buildbots. This change is necessary
to get the test to be more stable and not crash due to previous
processes exitting.
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 6682d71..0abd7ba 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -212,6 +212,7 @@
# If the import lock is held, the threads will hang.
raise TestSkipped("can't run when import lock is held")
+ reap_children()
try:
testall()
finally: