diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2020-06-22 17:58:18 -0400 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2020-09-08 21:02:53 -0400 |
| commit | 1bee1e6269b76b52b1eab9112d39c245beaa27a2 (patch) | |
| tree | 1b437fa47cf89317a767c7e5ae25087283d5d28a /test/functional/wallet_multiwallet.py | |
| parent | 78cb45d72251e85db07e8500bbdd2e9460b132b2 (diff) | |
| download | bitcoin-1bee1e6269b76b52b1eab9112d39c245beaa27a2.tar.xz | |
Do not create default wallet
No longer create a default wallet. The default wallet will still be
loaded if it exists and not other wallets were specified (anywhere,
including settings.json, bitcoin.conf, and command line).
Tests are updated to be started with -wallet= if they need the default
wallet.
Added test to wallet_startup.py testing that no default wallet is
created and that it is loaded if it exists and no other wallets were
specified.
Diffstat (limited to 'test/functional/wallet_multiwallet.py')
| -rwxr-xr-x | test/functional/wallet_multiwallet.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py index d64d3dcb49..aaf050ebf7 100755 --- a/test/functional/wallet_multiwallet.py +++ b/test/functional/wallet_multiwallet.py @@ -43,6 +43,7 @@ class MultiWalletTest(BitcoinTestFramework): self.setup_clean_chain = True self.num_nodes = 2 self.rpc_timeout = 120 + self.extra_args = [["-wallet="], ["-wallet="]] def skip_test_if_missing_module(self): self.skip_if_no_wallet() @@ -82,7 +83,7 @@ class MultiWalletTest(BitcoinTestFramework): os.rename(wallet_dir("wallet.dat"), wallet_dir("w8")) # create another dummy wallet for use in testing backups later - self.start_node(0, []) + self.start_node(0, ["-wallet="]) self.stop_nodes() empty_wallet = os.path.join(self.options.tmpdir, 'empty.dat') os.rename(wallet_dir("wallet.dat"), empty_wallet) @@ -152,7 +153,7 @@ class MultiWalletTest(BitcoinTestFramework): competing_wallet_dir = os.path.join(self.options.tmpdir, 'competing_walletdir') os.mkdir(competing_wallet_dir) - self.restart_node(0, ['-walletdir=' + competing_wallet_dir]) + self.restart_node(0, ['-walletdir=' + competing_wallet_dir, '-wallet=']) exp_stderr = r"Error: Error initializing wallet database environment \"\S+competing_walletdir\"!" self.nodes[1].assert_start_raises_init_error(['-walletdir=' + competing_wallet_dir], exp_stderr, match=ErrorMatch.PARTIAL_REGEX) |