diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-12-20 17:37:52 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-12-20 17:37:57 -0500 |
| commit | 604e08c83cf58ca7e7cda2ab284c1ace7bb12977 (patch) | |
| tree | 277c3aebee5e677bcf9e7654872d9411a00dfbbf /test | |
| parent | 79399c8cd0b6030034eea5feed3a7523e369b256 (diff) | |
| parent | aac6b3f06717626b88cdfd140f2cc1a3f2dde4be (diff) | |
| download | bitcoin-604e08c83cf58ca7e7cda2ab284c1ace7bb12977.tar.xz | |
Merge #11726: Cleanups + nit fixes for walletdir PR
aac6b3f067 Update files.md for new wallets/ subdirectory (MeshCollider)
b67342906c Cleanups for walletdir PR (MeshCollider)
Pull request description:
This addresses the remaining nits from https://github.com/bitcoin/bitcoin/pull/11466
- Updates `doc/files.md` with respect to the new default wallet directory
- Fixes @promag and @laanwj's error message nit, and Jonas' release notes nit
- ~Addresses @laanwj's net-specific wallet subdirectory concern in the case that a walletdir is specified~
- Changes the #includes from "" to <> style after #11651
Tree-SHA512: b86bf5fdc4de54c1b0f65b60a83af3cf82b35d216ce9c0de724803bfba6934796238b6c412659dcc29ae2e3e856d4eb97ae777c80f36f4089d8acecfddefe9aa
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/multiwallet.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/functional/multiwallet.py b/test/functional/multiwallet.py index 06409b6f31..d0c40e5446 100755 --- a/test/functional/multiwallet.py +++ b/test/functional/multiwallet.py @@ -40,7 +40,11 @@ class MultiWalletTest(BitcoinTestFramework): self.assert_start_raises_init_error(0, ['-wallet=w12'], 'Error loading wallet w12. -wallet filename must be a regular file.') # should not initialize if the specified walletdir does not exist - self.assert_start_raises_init_error(0, ['-walletdir=bad'], 'Error: Specified wallet directory "bad" does not exist.') + self.assert_start_raises_init_error(0, ['-walletdir=bad'], 'Error: Specified -walletdir "bad" does not exist') + # should not initialize if the specified walletdir is not a directory + not_a_dir = os.path.join(wallet_dir, 'notadir') + open(not_a_dir, 'a').close() + self.assert_start_raises_init_error(0, ['-walletdir='+not_a_dir], 'Error: Specified -walletdir "' + not_a_dir + '" is not a directory') # if wallets/ doesn't exist, datadir should be the default wallet dir wallet_dir2 = os.path.join(self.options.tmpdir, 'node0', 'regtest', 'walletdir') |