Merge pull request #52 from FND/connection-refused

ensure polling does not choke on ConnectionRefusedError
This commit is contained in:
Chris Dent
2015-07-14 10:55:49 +01:00
2 changed files with 8 additions and 1 deletions

View File

@@ -330,7 +330,7 @@ class HTTPTestCase(testcase.TestCase):
self._assert_response()
failure = None
break
except AssertionError as exc:
except (AssertionError, utils.ConnectionRefused) as exc:
failure = exc
count -= 1

View File

@@ -18,6 +18,13 @@ from __future__ import print_function
import httplib2
try: # Python 3
ConnectionRefused = ConnectionRefusedError
except NameError: # Python 2
import socket
ConnectionRefused = socket.error
class VerboseHttp(httplib2.Http):
"""A subclass of Http that verbosely reports on activity."""