traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Catch socket errors that are often the cause of transient failures. 

Many of these exceptions are due to resource unavailable, so the
existing code should be able to handle many more spurious errors.
This commit is contained in:
Neal Norwitz 2008-01-27 17:11:11 +00:00
parent 9846de1dfb
commit 183c5346fe
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Lib/test/test_xmlrpc.py
View File

@ -389,7 +389,7 @@ class SimpleServerTestCase(unittest.TestCase):
try: try:
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
self.assertEqual(p.pow(6,8), 6**8) self.assertEqual(p.pow(6,8), 6**8)
except xmlrpclib.ProtocolError, e: except (xmlrpclib.ProtocolError, socket.error), e:
# ignore failures due to non-blocking socket 'unavailable' errors # ignore failures due to non-blocking socket 'unavailable' errors
if not is_unavailable_exception(e): if not is_unavailable_exception(e):
# protocol error; provide additional information in test output # protocol error; provide additional information in test output
@ -415,7 +415,7 @@ class SimpleServerTestCase(unittest.TestCase):
'system.listMethods', 'system.methodHelp', 'system.listMethods', 'system.methodHelp',
'system.methodSignature', 'system.multicall']) 'system.methodSignature', 'system.multicall'])
self.assertEqual(set(meth), expected_methods) self.assertEqual(set(meth), expected_methods)
except xmlrpclib.ProtocolError, e: except (xmlrpclib.ProtocolError, socket.error), e:
# ignore failures due to non-blocking socket 'unavailable' errors # ignore failures due to non-blocking socket 'unavailable' errors
if not is_unavailable_exception(e): if not is_unavailable_exception(e):
# protocol error; provide additional information in test output # protocol error; provide additional information in test output
@ -427,7 +427,7 @@ class SimpleServerTestCase(unittest.TestCase):
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
divhelp = p.system.methodHelp('div') divhelp = p.system.methodHelp('div')
self.assertEqual(divhelp, 'This is the div function') self.assertEqual(divhelp, 'This is the div function')
except xmlrpclib.ProtocolError, e: except (xmlrpclib.ProtocolError, socket.error), e:
# ignore failures due to non-blocking socket 'unavailable' errors # ignore failures due to non-blocking socket 'unavailable' errors
if not is_unavailable_exception(e): if not is_unavailable_exception(e):
# protocol error; provide additional information in test output # protocol error; provide additional information in test output
@ -439,7 +439,7 @@ class SimpleServerTestCase(unittest.TestCase):
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
myfunction = p.system.methodHelp('my_function') myfunction = p.system.methodHelp('my_function')
self.assertEqual(myfunction, 'This is my function') self.assertEqual(myfunction, 'This is my function')
except xmlrpclib.ProtocolError, e: except (xmlrpclib.ProtocolError, socket.error), e:
# ignore failures due to non-blocking socket 'unavailable' errors # ignore failures due to non-blocking socket 'unavailable' errors
if not is_unavailable_exception(e): if not is_unavailable_exception(e):
# protocol error; provide additional information in test output # protocol error; provide additional information in test output
@ -452,7 +452,7 @@ class SimpleServerTestCase(unittest.TestCase):
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
divsig = p.system.methodSignature('div') divsig = p.system.methodSignature('div')
self.assertEqual(divsig, 'signatures not supported') self.assertEqual(divsig, 'signatures not supported')
except xmlrpclib.ProtocolError, e: except (xmlrpclib.ProtocolError, socket.error), e:
# ignore failures due to non-blocking socket 'unavailable' errors # ignore failures due to non-blocking socket 'unavailable' errors
if not is_unavailable_exception(e): if not is_unavailable_exception(e):
# protocol error; provide additional information in test output # protocol error; provide additional information in test output
@ -469,7 +469,7 @@ class SimpleServerTestCase(unittest.TestCase):
self.assertEqual(add_result, 2+3) self.assertEqual(add_result, 2+3)
self.assertEqual(pow_result, 6**8) self.assertEqual(pow_result, 6**8)
self.assertEqual(div_result, 127//42) self.assertEqual(div_result, 127//42)
except xmlrpclib.ProtocolError, e: except (xmlrpclib.ProtocolError, socket.error), e:
# ignore failures due to non-blocking socket 'unavailable' errors # ignore failures due to non-blocking socket 'unavailable' errors
if not is_unavailable_exception(e): if not is_unavailable_exception(e):
# protocol error; provide additional information in test output # protocol error; provide additional information in test output
@ -490,7 +490,7 @@ class SimpleServerTestCase(unittest.TestCase):
self.assertEqual(result.results[0]['faultString'], self.assertEqual(result.results[0]['faultString'],
'<type \'exceptions.Exception\'>:method "this_is_not_exists" ' '<type \'exceptions.Exception\'>:method "this_is_not_exists" '
'is not supported') 'is not supported')
except xmlrpclib.ProtocolError, e: except (xmlrpclib.ProtocolError, socket.error), e:
# ignore failures due to non-blocking socket 'unavailable' errors # ignore failures due to non-blocking socket 'unavailable' errors
if not is_unavailable_exception(e): if not is_unavailable_exception(e):
# protocol error; provide additional information in test output # protocol error; provide additional information in test output
@ -545,7 +545,7 @@ class FailingServerTestCase(unittest.TestCase):
try: try:
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
self.assertEqual(p.pow(6,8), 6**8) self.assertEqual(p.pow(6,8), 6**8)
except xmlrpclib.ProtocolError, e: except (xmlrpclib.ProtocolError, socket.error), e:
# ignore failures due to non-blocking socket 'unavailable' errors # ignore failures due to non-blocking socket 'unavailable' errors
if not is_unavailable_exception(e): if not is_unavailable_exception(e):
# protocol error; provide additional information in test output # protocol error; provide additional information in test output
@ -558,7 +558,7 @@ class FailingServerTestCase(unittest.TestCase):
try: try:
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
p.pow(6,8) p.pow(6,8)
except xmlrpclib.ProtocolError, e: except (xmlrpclib.ProtocolError, socket.error), e:
# ignore failures due to non-blocking socket 'unavailable' errors # ignore failures due to non-blocking socket 'unavailable' errors
if not is_unavailable_exception(e): if not is_unavailable_exception(e):
# The two server-side error headers shouldn't be sent back in this case # The two server-side error headers shouldn't be sent back in this case
@ -578,7 +578,7 @@ class FailingServerTestCase(unittest.TestCase):
try: try:
p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT) p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
p.pow(6,8) p.pow(6,8)
except xmlrpclib.ProtocolError, e: except (xmlrpclib.ProtocolError, socket.error), e:
# ignore failures due to non-blocking socket 'unavailable' errors # ignore failures due to non-blocking socket 'unavailable' errors
if not is_unavailable_exception(e): if not is_unavailable_exception(e):
# We should get error info in the response # We should get error info in the response