From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 24 Mar 2008 05:51:45 +0000 (+0000)
Subject: Skip test if socket gets reset, the problem is on the other side.
X-Git-Tag: v3.0a4~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64018ae0572044af8817a7096977792c0935ba7c;p=thirdparty%2FPython%2Fcpython.git

Skip test if socket gets reset, the problem is on the other side.
---

diff --git a/Lib/test/test_xmlrpc_net.py b/Lib/test/test_xmlrpc_net.py
index 4751d572538b..260bc240a6be 100644
--- a/Lib/test/test_xmlrpc_net.py
+++ b/Lib/test/test_xmlrpc_net.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
 
+import errno
+import socket
+import sys
 import unittest
 from test import test_support
 
@@ -11,7 +14,14 @@ class CurrentTimeTest(unittest.TestCase):
         # Get the current time from xmlrpc.com.  This code exercises
         # the minimal HTTP functionality in xmlrpclib.
         server = xmlrpclib.ServerProxy("http://time.xmlrpc.com/RPC2")
-        t0 = server.currentTime.getCurrentTime()
+        try:
+            t0 = server.currentTime.getCurrentTime()
+        except socket.error as e:
+            if e.errno != errno.ECONNRESET:
+                raise
+            print("    test_current_time: socket got reset, skipping test",
+                  file=sys.stderr)
+            return
 
         # Perform a minimal sanity check on the result, just to be sure
         # the request means what we think it means.