From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 30 Oct 2009 17:58:27 +0000 (+0000)
Subject: Merged revisions 75962-75963 via svnmerge from
X-Git-Tag: v3.2a1~2274
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e03866f6f148f6671a1fa56f7f2b2e5697a3d868;p=python

Merged revisions 75962-75963 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75962 | antoine.pitrou | 2009-10-30 18:55:21 +0100 (ven., 30 oct. 2009) | 3 lines

  Try to fix transient refleaks in test_asynchat.
........
  r75963 | antoine.pitrou | 2009-10-30 18:56:00 +0100 (ven., 30 oct. 2009) | 3 lines

  Try to fix transient refleaks in test_xmlrpc.
........
---

diff --git a/Lib/test/test_asynchat.py b/Lib/test/test_asynchat.py
index f49701fd84..1778a5fcc6 100644
--- a/Lib/test/test_asynchat.py
+++ b/Lib/test/test_asynchat.py
@@ -93,10 +93,10 @@ class TestAsynchat(unittest.TestCase):
     usepoll = False
 
     def setUp (self):
-        pass
+        self._threads = support.threading_setup()
 
     def tearDown (self):
-        pass
+        support.threading_cleanup(*self._threads)
 
     def line_terminator_check(self, term, server_chunk):
         event = threading.Event()
diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
index bd00ab110e..f229284256 100644
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -798,6 +798,7 @@ class CGIHandlerTestCase(unittest.TestCase):
             len(content))
 
 
+@support.reap_threads
 def test_main():
     xmlrpc_tests = [XMLRPCTestCase, HelperTestCase, DateTimeTestCase,
          BinaryTestCase, FaultTestCase]