[Python-checkins] cpython (merge 3.2 -> default): Merge test_xmlrpc_net fixes (issue #13434)

[antoine.pitrou]

http://hg.python.org/cpython/rev/1330beac9ec9
changeset:   73779:1330beac9ec9
parent:      73776:c86fb10eaf68
parent:      73778:d2e5bc1accfb
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Mon Nov 28 21:15:22 2011 +0100
summary:
  Merge test_xmlrpc_net fixes (issue #13434)

files:
  Lib/test/test_xmlrpc_net.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_xmlrpc_net.py b/Lib/test/test_xmlrpc_net.py
--- a/Lib/test/test_xmlrpc_net.py
+++ b/Lib/test/test_xmlrpc_net.py
@@ -14,6 +14,7 @@
     def test_current_time(self):
         # Get the current time from xmlrpc.com.  This code exercises
         # the minimal HTTP functionality in xmlrpclib.
+        self.skipTest("time.xmlrpc.com is unreliable")
         server = xmlrpclib.ServerProxy("http://time.xmlrpc.com/RPC2")
         try:
             t0 = server.currentTime.getCurrentTime()
@@ -38,13 +39,13 @@
     def test_python_builders(self):
         # Get the list of builders from the XMLRPC buildbot interface at
         # python.org.
-        self.skipTest("XMLRPC interface removed in Buildbot 0.8.2")
         server = xmlrpclib.ServerProxy("http://www.python.org/dev/buildbot/all/xmlrpc/")
         try:
             builders = server.getAllBuilders()
         except socket.error as e:
             self.skipTest("network error: %s" % e)
             return
+        self.addCleanup(lambda: server('close')())
 
         # Perform a minimal sanity check on the result, just to be sure
         # the request means what we think it means.

-- 
Repository URL: http://hg.python.org/cpython