diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-09-30 12:35:17 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-09-30 12:35:21 +0200 |
| commit | 0572acd63bc810b71e595138bbb0fcf17a138c8a (patch) | |
| tree | 0d714c040fff9a24fe3b64f8a87305eefa30ea61 | |
| parent | Merge #8840: test: Explicitly set encoding to utf8 when opening text files (diff) | |
| parent | test: Avoid ConnectionResetErrors during RPC tests (diff) | |
| download | discoin-0572acd63bc810b71e595138bbb0fcf17a138c8a.tar.xz discoin-0572acd63bc810b71e595138bbb0fcf17a138c8a.zip | |
Merge #8839: test: Avoid ConnectionResetErrors during RPC tests
1d28faf test: Avoid ConnectionResetErrors during RPC tests (Wladimir J. van der Laan)
| -rw-r--r-- | qa/rpc-tests/test_framework/authproxy.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py index f5e0be20d..fd7f32b5c 100644 --- a/qa/rpc-tests/test_framework/authproxy.py +++ b/qa/rpc-tests/test_framework/authproxy.py @@ -130,8 +130,9 @@ class AuthServiceProxy(object): return self._get_response() else: raise - except BrokenPipeError: - # Python 3.5+ raises this instead of BadStatusLine when the connection was reset + except (BrokenPipeError,ConnectionResetError): + # Python 3.5+ raises BrokenPipeError instead of BadStatusLine when the connection was reset + # ConnectionResetError happens on FreeBSD with Python 3.4 self.__conn.close() self.__conn.request(method, path, postdata, headers) return self._get_response() |