foster/bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-05 14:06:27 -05:00
Code Issues Activity

test: Fix intermittent ETIMEDOUT on FreeBSD

Browse source
This commit is contained in:
MarcoFalke 2020-05-19 19:12:45 -04:00
parent aa8d76806c
commit fab908f18a
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
test/functional/test_framework/test_node.py
View file

@ -219,7 +219,12 @@ class TestNode():
raise FailedToStartError(self._node_msg( raise FailedToStartError(self._node_msg(
'bitcoind exited with status {} during initialization'.format(self.process.returncode))) 'bitcoind exited with status {} during initialization'.format(self.process.returncode)))
try: try:
rpc = get_rpc_proxy(rpc_url(self.datadir, self.index, self.chain, self.rpchost), self.index, timeout=self.rpc_timeout, coveragedir=self.coverage_dir) rpc = get_rpc_proxy(
rpc_url(self.datadir, self.index, self.chain, self.rpchost),
self.index,
timeout=self.rpc_timeout // 2, # Shorter timeout to allow for one retry in case of ETIMEDOUT
coveragedir=self.coverage_dir,
)
rpc.getblockcount() rpc.getblockcount()
# If the call to getblockcount() succeeds then the RPC connection is up # If the call to getblockcount() succeeds then the RPC connection is up
if self.version_is_at_least(190000): if self.version_is_at_least(190000):
@ -260,7 +265,11 @@ class TestNode():
# succeeds. Try again to properly raise the FailedToStartError # succeeds. Try again to properly raise the FailedToStartError
pass pass
except OSError as e: except OSError as e:
if e.errno != errno.ECONNREFUSED: # Port not yet open? if e.errno == errno.ETIMEDOUT:
pass # Treat identical to ConnectionResetError
elif e.errno == errno.ECONNREFUSED:
pass # Port not yet open?
else:
raise # unknown OS error raise # unknown OS error
except ValueError as e: # cookie file not found and no rpcuser or rpcpassword; bitcoind is still starting except ValueError as e: # cookie file not found and no rpcuser or rpcpassword; bitcoind is still starting
if "No RPC credentials" not in str(e): if "No RPC credentials" not in str(e):