Skip to content

Commit ab660c8

Browse files
author
MarcoFalke
committed
Merge #14413: tests: Allow closed rpc handler in assert_start_raises_init_error
62c304e tests: Allow closed http server in assert_start_raises_init_error (Chun Kuan Lee) Pull request description: The rpc handler may be unregistered when http server haven't been closed yet. So it may be allowable to get -342 `non-JSON HTTP response with \'%i %s\' from server` (503 Service Unavailable) See https://ci.appveyor.com/project/DrahtBot/bitcoin/build/master.2001. It shows "Rejecting request while shutting down" between "RPC stopped" and "Stopped HTTP server" Tree-SHA512: e1f50ab9096cf23494ccc2850c01516c4a75f112c99108759157b22fce2011682a4b88216f206702f6a56e960182c00098053ad75f13aa0eafe27046adae63da
2 parents d9acd86 + 62c304e commit ab660c8

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

test/functional/test_framework/test_node.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,9 @@ def wait_for_rpc_connection(self):
187187
if e.errno != errno.ECONNREFUSED: # Port not yet open?
188188
raise # unknown IO error
189189
except JSONRPCException as e: # Initialization phase
190-
if e.error['code'] != -28: # RPC in warmup?
190+
# -28 RPC in warmup
191+
# -342 Service unavailable, RPC server started but is shutting down due to error
192+
if e.error['code'] != -28 and e.error['code'] != -342:
191193
raise # unknown JSON RPC exception
192194
except ValueError as e: # cookie file not found and no rpcuser or rpcassword. bitcoind still starting
193195
if "No RPC credentials" not in str(e):

0 commit comments

Comments
 (0)