diff options
| author | merge-script <falke.marco@gmail.com> | 2021-09-27 09:26:21 +0200 |
|---|---|---|
| committer | merge-script <falke.marco@gmail.com> | 2021-09-27 09:26:21 +0200 |
| commit | 58c25bdcea9b95348e639180932b388d4bda8157 (patch) | |
| tree | f51ec0c28bab80558bea44d230b8934d78c78fcf | |
| parent | ba3f0b2c48172ef94e9e55ad6a1df789391f59c4 (diff) | |
| parent | fad02274ba28189f28f5af536b8ea0ecddf9df55 (diff) | |
| download | bitcoin-58c25bdcea9b95348e639180932b388d4bda8157.tar.xz | |
Merge bitcoin/bitcoin#23092: test: Remove Windows workaround in authproxy
fad02274ba28189f28f5af536b8ea0ecddf9df55 test: Remove Windows workaround in authproxy (MarcoFalke)
Pull request description:
Might no longer be needed after https://github.com/bitcoin/bitcoin/pull/23089
ACKs for top commit:
hebasto:
ACK fad02274ba28189f28f5af536b8ea0ecddf9df55, passed 3 consequential runs on my [personal CI](https://cirrus-ci.com/task/4897456077930496):
Tree-SHA512: 3c408e068ad7590dc0e5922c0b4cd3bf927e22fe624b13b8ab38db848342d310c9c934f358638fd5234c7b5f10f95d3bddc676deb925dcbba54945e2e8229275
| -rw-r--r-- | test/functional/test_framework/authproxy.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/functional/test_framework/authproxy.py b/test/functional/test_framework/authproxy.py index 81eb881234..c4ffd1fbf6 100644 --- a/test/functional/test_framework/authproxy.py +++ b/test/functional/test_framework/authproxy.py @@ -113,10 +113,8 @@ class AuthServiceProxy(): self.__conn.request(method, path, postdata, headers) return self._get_response() except OSError as e: - retry = ( - '[WinError 10053] An established connection was aborted by the software in your host machine' in str(e)) # Workaround for a bug on macOS. See https://bugs.python.org/issue33450 - retry = retry or ('[Errno 41] Protocol wrong type for socket' in str(e)) + retry = '[Errno 41] Protocol wrong type for socket' in str(e) if retry: self.__conn.close() self.__conn.request(method, path, postdata, headers) |