Skip to content

Commit 58c25bd

Browse files
author
merge-script
committed
Merge bitcoin/bitcoin#23092: test: Remove Windows workaround in authproxy
fad0227 test: Remove Windows workaround in authproxy (MarcoFalke) Pull request description: Might no longer be needed after bitcoin/bitcoin#23089 ACKs for top commit: hebasto: ACK fad0227, passed 3 consequential runs on my [personal CI](https://cirrus-ci.com/task/4897456077930496): Tree-SHA512: 3c408e068ad7590dc0e5922c0b4cd3bf927e22fe624b13b8ab38db848342d310c9c934f358638fd5234c7b5f10f95d3bddc676deb925dcbba54945e2e8229275
2 parents ba3f0b2 + fad0227 commit 58c25bd

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

test/functional/test_framework/authproxy.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,8 @@ def _request(self, method, path, postdata):
113113
self.__conn.request(method, path, postdata, headers)
114114
return self._get_response()
115115
except OSError as e:
116-
retry = (
117-
'[WinError 10053] An established connection was aborted by the software in your host machine' in str(e))
118116
# Workaround for a bug on macOS. See https://bugs.python.org/issue33450
119-
retry = retry or ('[Errno 41] Protocol wrong type for socket' in str(e))
117+
retry = '[Errno 41] Protocol wrong type for socket' in str(e)
120118
if retry:
121119
self.__conn.close()
122120
self.__conn.request(method, path, postdata, headers)

0 commit comments

Comments
 (0)