zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix display of binary name in error messages. 

Ensures that test failures report the name of the actual binary that was run.
This commit is contained in:
Greg Pfeil 2022-09-01 09:44:59 -06:00
parent 6c392dbb0b
commit 6a7c86e63b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qa/rpc-tests/test_framework/util.py
View File

@ -54,6 +54,9 @@ PORT_MIN = 11000
PORT_RANGE = 5000 PORT_RANGE = 5000
def bitcoind_binary():
return os.getenv("ZCASHD", ZCASHD_BINARY)
class PortSeed: class PortSeed:
# Must be initialized with a unique integer for each process # Must be initialized with a unique integer for each process
n = None n = None
@ -211,7 +214,7 @@ def wait_for_bitcoind_start(process, url, i):
''' '''
while True: while True:
if process.poll() is not None: if process.poll() is not None:
raise Exception('bitcoind exited with status %i during initialization' % process.returncode) raise Exception('%s exited with status %i during initialization' % (bitcoind_binary(), process.returncode))
try: try:
rpc = get_rpc_proxy(url, i) rpc = get_rpc_proxy(url, i)
rpc.getblockcount() rpc.getblockcount()
@ -257,7 +260,7 @@ def initialize_chain(test_dir, num_nodes, cachedir, cache_behavior='current'):
block_time = int(time.time()) - (200 * PRE_BLOSSOM_BLOCK_TARGET_SPACING) block_time = int(time.time()) - (200 * PRE_BLOSSOM_BLOCK_TARGET_SPACING)
for i in range(MAX_NODES): for i in range(MAX_NODES):
datadir = initialize_datadir(cachedir, i) datadir = initialize_datadir(cachedir, i)
args = [ os.getenv("ZCASHD", ZCASHD_BINARY), "-keypool=1", "-datadir="+datadir, "-discover=0" ] args = [ bitcoind_binary(), "-keypool=1", "-datadir="+datadir, "-discover=0" ]
args.extend([ args.extend([
'-nuparams=5ba81b19:1', # Overwinter '-nuparams=5ba81b19:1', # Overwinter
'-nuparams=76b809bb:1', # Sapling '-nuparams=76b809bb:1', # Sapling
@ -267,7 +270,7 @@ def initialize_chain(test_dir, num_nodes, cachedir, cache_behavior='current'):
args.append("-connect=127.0.0.1:"+str(p2p_port(0))) args.append("-connect=127.0.0.1:"+str(p2p_port(0)))
bitcoind_processes[i] = subprocess.Popen(args) bitcoind_processes[i] = subprocess.Popen(args)
if os.getenv("PYTHON_DEBUG", ""): if os.getenv("PYTHON_DEBUG", ""):
print("initialize_chain: bitcoind started, waiting for RPC to come up") print("initialize_chain: %s started, waiting for RPC to come up" % bitcoind_binary())
wait_for_bitcoind_start(bitcoind_processes[i], rpc_url(i), i) wait_for_bitcoind_start(bitcoind_processes[i], rpc_url(i), i)
if os.getenv("PYTHON_DEBUG", ""): if os.getenv("PYTHON_DEBUG", ""):
print("initialize_chain: RPC successfully started") print("initialize_chain: RPC successfully started")
@ -438,9 +441,9 @@ def assert_start_raises_init_error(i, dirname, extra_args=None, expected_msg=Non
raise AssertionError("Expected error \"" + expected_msg + "\" not found in:\n" + stderr) raise AssertionError("Expected error \"" + expected_msg + "\" not found in:\n" + stderr)
else: else:
if expected_msg is None: if expected_msg is None:
assert_msg = "bitcoind should have exited with an error" assert_msg = "%s should have exited with an error" % bitcoind_binary()
else: else:
assert_msg = "bitcoind should have exited with expected error " + expected_msg assert_msg = "%s should have exited with expected error %s" % (bitcoind_binary(), expected_msg)
raise AssertionError(assert_msg) raise AssertionError(assert_msg)
def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None, binary=None): def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None, binary=None):