From f6d7636be4eb0b19878428906dd5e394df7d07a2 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Fri, 5 May 2023 13:35:30 +0100 Subject: [PATCH] test: Treat `bitcoin-wallet` binary in the same way as others This change makes the `bitcoin-wallet` binary path customizable in the same way how it can be done now with other ones, including `bitcoind`, `bitcoin-cli` and `bitcoin-util`. --- test/functional/test_framework/test_framework.py | 1 + test/functional/tool_wallet.py | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 46a5cfa70c4..d4dc90a517a 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -235,6 +235,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): "bitcoind": ("bitcoind", "BITCOIND"), "bitcoin-cli": ("bitcoincli", "BITCOINCLI"), "bitcoin-util": ("bitcoinutil", "BITCOINUTIL"), + "bitcoin-wallet": ("bitcoinwallet", "BITCOINWALLET"), } for binary, [attribute_name, env_variable_name] in binaries.items(): default_filename = os.path.join( diff --git a/test/functional/tool_wallet.py b/test/functional/tool_wallet.py index a888f93b03e..95999649b43 100755 --- a/test/functional/tool_wallet.py +++ b/test/functional/tool_wallet.py @@ -32,12 +32,11 @@ class ToolWalletTest(BitcoinTestFramework): self.skip_if_no_wallet_tool() def bitcoin_wallet_process(self, *args): - binary = self.config["environment"]["BUILDDIR"] + '/src/bitcoin-wallet' + self.config["environment"]["EXEEXT"] default_args = ['-datadir={}'.format(self.nodes[0].datadir), '-chain=%s' % self.chain] if not self.options.descriptors and 'create' in args: default_args.append('-legacy') - return subprocess.Popen([binary] + default_args + list(args), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True) + return subprocess.Popen([self.options.bitcoinwallet] + default_args + list(args), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True) def assert_raises_tool_error(self, error, *args): p = self.bitcoin_wallet_process(*args)