highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-26 15:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: Properly raise FailedToStartError when rpc shutdown before warmup finished (take 2)

Browse Source
This commit is contained in:
MarcoFalke
2020-04-14 10:19:13 -04:00
parent 4702cadca9
commit fa03713e13
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/functional/test_framework/test_node.py
View File

@@ -225,9 +225,6 @@ class TestNode():
self.rpc_connected = True self.rpc_connected = True
self.url = self.rpc.url self.url = self.rpc.url
return return
except IOError as e:
if e.errno != errno.ECONNREFUSED: # Port not yet open?
raise # unknown IO error
except JSONRPCException as e: # Initialization phase except JSONRPCException as e: # Initialization phase
# -28 RPC in warmup # -28 RPC in warmup
# -342 Service unavailable, RPC server started but is shutting down due to error # -342 Service unavailable, RPC server started but is shutting down due to error
@@ -237,6 +234,9 @@ class TestNode():
# This might happen when the RPC server is in warmup, but shut down before the call to getblockcount # This might happen when the RPC server is in warmup, but shut down before the call to getblockcount
# succeeds. Try again to properly raise the FailedToStartError # succeeds. Try again to properly raise the FailedToStartError
pass pass
except OSError as e:
if e.errno != errno.ECONNREFUSED: # Port not yet open?
raise # unknown OS error
except ValueError as e: # cookie file not found and no rpcuser or rpcassword. bitcoind still starting except ValueError as e: # cookie file not found and no rpcuser or rpcassword. bitcoind still starting
if "No RPC credentials" not in str(e): if "No RPC credentials" not in str(e):
raise raise