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/feature_filelock.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/feature_filelock.py')
| -rwxr-xr-x | test/functional/feature_filelock.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/feature_filelock.py b/test/functional/feature_filelock.py index b56ffe179f..e4ceb62c94 100755 --- a/test/functional/feature_filelock.py +++ b/test/functional/feature_filelock.py @@ -15,7 +15,7 @@ class FilelockTest(BitcoinTestFramework): def setup_network(self): self.add_nodes(self.num_nodes, extra_args=None) - self.nodes[0].start([]) + self.nodes[0].start(['-wallet=']) self.nodes[0].wait_for_rpc_connection() def run_test(self): @@ -30,7 +30,7 @@ class FilelockTest(BitcoinTestFramework): wallet_dir = os.path.join(datadir, 'wallets') self.log.info("Check that we can't start a second bitcoind instance using the same wallet") expected_msg = "Error: Error initializing wallet database environment" - self.nodes[1].assert_start_raises_init_error(extra_args=['-walletdir={}'.format(wallet_dir), '-noserver'], expected_msg=expected_msg, match=ErrorMatch.PARTIAL_REGEX) + self.nodes[1].assert_start_raises_init_error(extra_args=['-walletdir={}'.format(wallet_dir), '-wallet=', '-noserver'], expected_msg=expected_msg, match=ErrorMatch.PARTIAL_REGEX) if __name__ == '__main__': FilelockTest().main() |