Partially revert changeset #281857369a78 to make sure threads are

brettcannon · brettcannon · commit e382b5868a4d · 2013-06-12T21:25:23.000-04:00
reaped in all situations.
diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
@@ -1079,5 +1079,15 @@ def test_xmlrpcserver_has_use_builtin_types_flag(self):
         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()
