summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-10-27 21:32:38 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-10-27 21:32:38 (GMT)
commitc00d4b437d544268b699fc57fe9e7c57ae89f1b3 (patch)
tree5210f594d4544e73e858ef7b76b9f8be70560b4d
parent8c0e217158cac54fd32fb3b61e715f6a79e55209 (diff)
downloadcpython-c00d4b437d544268b699fc57fe9e7c57ae89f1b3.zip
cpython-c00d4b437d544268b699fc57fe9e7c57ae89f1b3.tar.gz
cpython-c00d4b437d544268b699fc57fe9e7c57ae89f1b3.tar.bz2
Merged revisions 75874 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r75874 | antoine.pitrou | 2009-10-27 22:27:24 +0100 (mar., 27 oct. 2009) | 4 lines Reduce the probability of refleaks in test_socketserver. Not completely suppressed though, see issue #7222. ........
-rw-r--r--Lib/test/test_socketserver.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 43ce55c..ce6e1f0 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -16,7 +16,7 @@ import unittest
import socketserver
import test.support
-from test.support import reap_children, verbose
+from test.support import reap_children, reap_threads, verbose
from test.support import TESTFN as TEST_FILE
test.support.requires("network")
@@ -122,6 +122,7 @@ class SocketServerTest(unittest.TestCase):
self.assertEquals(server.server_address, server.socket.getsockname())
return server
+ @reap_threads
def run_server(self, svrcls, hdlrbase, testfunc):
server = self.make_server(self.pickaddr(svrcls.address_family),
svrcls, hdlrbase)