From: Brett Cannon <brett@python.org>
Date: Thu, 13 Jun 2013 01:25:23 +0000 (-0400)
Subject: Partially revert changeset #281857369a78 to make sure threads are
X-Git-Tag: v3.4.0a1~521
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e382b5868a4daca614589270b6b3fe5c50059986;p=thirdparty%2FPython%2Fcpython.git

Partially revert changeset #281857369a78 to make sure threads are
reaped in all situations.
---

diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
index 4705a0d71326..99be297340b0 100644
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -1079,5 +1079,15 @@ class UseBuiltinTypesTestCase(unittest.TestCase):
         self.assertTrue(server.use_builtin_types)
 
 
+@support.reap_threads
+def test_main():
+    support.run_unittest(XMLRPCTestCase, HelperTestCase, DateTimeTestCase,
+            BinaryTestCase, FaultTestCase, UseBuiltinTypesTestCase,
+            SimpleServerTestCase, KeepaliveServerTestCase1,
+            KeepaliveServerTestCase2, GzipServerTestCase,
+            MultiPathServerTestCase, ServerProxyTestCase, FailingServerTestCase,
+            CGIHandlerTestCase)
+
+
 if __name__ == "__main__":
-    support.reap_threads(unittest.main)()
+    test_main()