aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2020-04-11 20:31:31 -0400
committerMarcoFalke <falke.marco@gmail.com>2020-04-12 08:50:39 -0400
commitfa9f4f663c36b0824406036445e5cff0a78174e9 (patch)
tree86a4398f0084dfca3e8b92a25b013b1cf7bc33c2 /test
parentfae760f2b24cb26494b65c0a7ac38b92ead345af (diff)
test: Remove python 3.4 workaround
Diffstat (limited to 'test')
-rw-r--r--test/functional/test_framework/authproxy.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/test/functional/test_framework/authproxy.py b/test/functional/test_framework/authproxy.py
index 4ba6ac1db2..c7837d3f6f 100644
--- a/test/functional/test_framework/authproxy.py
+++ b/test/functional/test_framework/authproxy.py
@@ -105,16 +105,9 @@ class AuthServiceProxy():
try:
self.__conn.request(method, path, postdata, headers)
return self._get_response()
- except http.client.BadStatusLine as e:
- if e.line == "''": # if connection was closed, try again
- self.__conn.close()
- self.__conn.request(method, path, postdata, headers)
- return self._get_response()
- else:
- raise
except (BrokenPipeError, ConnectionResetError):
- # Python 3.5+ raises BrokenPipeError instead of BadStatusLine when the connection was reset
- # ConnectionResetError happens on FreeBSD with Python 3.4
+ # Python 3.5+ raises BrokenPipeError when the connection was reset
+ # ConnectionResetError happens on FreeBSD
self.__conn.close()
self.__conn.request(method, path, postdata, headers)
return self._get_response()