aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2016-06-03 08:52:45 +0200
committerMarcoFalke <falke.marco@gmail.com>2016-06-03 08:53:43 +0200
commitae5575ba41c8a782805afb1c08730343cfc22397 (patch)
tree9a39a5ed851d901982ba5e888a035dfd703a7da5
parenta82f03393a32842d49236e8666ee57805ca701f8 (diff)
parentf45f51e3ae4fca24bc49474ca61c3262186c447d (diff)
downloadbitcoin-ae5575ba41c8a782805afb1c08730343cfc22397.tar.xz
Merge #8139: Fix interrupted HTTP RPC connection workaround for Python 3.5+
f45f51e Fix interrupted HTTP RPC connection workaround for Python 3.5+ (Pieter Wuille)
-rw-r--r--qa/rpc-tests/test_framework/authproxy.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py
index e5f7ab3656..95b2be658c 100644
--- a/qa/rpc-tests/test_framework/authproxy.py
+++ b/qa/rpc-tests/test_framework/authproxy.py
@@ -124,6 +124,11 @@ class AuthServiceProxy(object):
return self._get_response()
else:
raise
+ except BrokenPipeError:
+ # Python 3.5+ raises this instead of BadStatusLine when the connection was reset
+ self.__conn.close()
+ self.__conn.request(method, path, postdata, headers)
+ return self._get_response()
def __call__(self, *args):
AuthServiceProxy.__id_count += 1