From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 27 Oct 2009 21:32:38 +0000 (+0000)
Subject: Merged revisions 75874 via svnmerge from
X-Git-Tag: v3.2a1~2294
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c00d4b437d544268b699fc57fe9e7c57ae89f1b3;p=python

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.
........
---

diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 43ce55c37a..ce6e1f0114 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)