summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-08-28 06:29:09 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-08-28 06:29:09 (GMT)
commit6665cefb852fd728b6db25ce38d3ba3134c08044 (patch)
tree4f46818f3ad112823c0caddae2492dbf24f62954 /Lib
parent1b1498b42e00a5bbb29f67e49f5993a47fb9cceb (diff)
downloadcpython-6665cefb852fd728b6db25ce38d3ba3134c08044.zip
cpython-6665cefb852fd728b6db25ce38d3ba3134c08044.tar.gz
cpython-6665cefb852fd728b6db25ce38d3ba3134c08044.tar.bz2
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.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_socketserver.py1
1 files changed, 1 insertions, 0 deletions
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 @@ def test_main():
# 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: