diff options
Diffstat (limited to 'test/functional/tool_wallet.py')
| -rwxr-xr-x | test/functional/tool_wallet.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/test/functional/tool_wallet.py b/test/functional/tool_wallet.py index b0b9adab87..387ba276dd 100755 --- a/test/functional/tool_wallet.py +++ b/test/functional/tool_wallet.py @@ -5,7 +5,6 @@ """Test bitcoin-wallet.""" import os -import platform import random import stat import string @@ -49,7 +48,7 @@ class ToolWalletTest(BitcoinTestFramework): if "dump" in args and self.options.bdbro: default_args.append("-withinternalbdb") - return subprocess.Popen([self.options.bitcoinwallet] + default_args + list(args), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True) + return subprocess.Popen(self.get_binaries().wallet_argv() + 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) @@ -367,8 +366,7 @@ class ToolWalletTest(BitcoinTestFramework): self.do_tool_createfromdump("load", "wallet.dump") if self.is_bdb_compiled(): self.do_tool_createfromdump("load-bdb", "wallet.dump", "bdb") - if self.is_sqlite_compiled(): - self.do_tool_createfromdump("load-sqlite", "wallet.dump", "sqlite") + self.do_tool_createfromdump("load-sqlite", "wallet.dump", "sqlite") self.log.info('Checking createfromdump handling of magic and versions') bad_ver_wallet_dump = self.nodes[0].datadir_path / "wallet-bad_ver1.dump" @@ -537,9 +535,7 @@ class ToolWalletTest(BitcoinTestFramework): # Next cause a bunch of writes by filling the keypool wallet.keypoolrefill(wallet.getwalletinfo()["keypoolsize"] + 100) # Lastly kill bitcoind so that the LSNs don't get reset - self.nodes[0].process.kill() - self.nodes[0].wait_until_stopped(expected_ret_code=1 if platform.system() == "Windows" else -9) - assert self.nodes[0].is_node_stopped() + self.nodes[0].kill_process() wallet_dump = self.nodes[0].datadir_path / "unclean_lsn.dump" self.assert_raises_tool_error("LSNs are not reset, this database is not completely flushed. Please reopen then close the database with a version that has BDB support", "-wallet=unclean_lsn", f"-dumpfile={wallet_dump}", "dump") |