diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-10-24 17:22:25 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-10-24 17:37:32 +0200 |
| commit | 2b88f67e0bccbc23f30bf65f944f5cadad88f221 (patch) | |
| tree | a7c327243df2f300936d99ced1706eec455fc775 /test/functional/wallet_multiwallet.py | |
| parent | 6241eb3224d95ea04c04dcab2dac88687f49440e (diff) | |
| parent | 4ea77320c5f0b275876be41ff530bb328ba0cb87 (diff) | |
| download | bitcoin-2b88f67e0bccbc23f30bf65f944f5cadad88f221.tar.xz | |
Merge #14320: [bugfix] wallet: Fix duplicate fileid detection
4ea77320c5f0b275876be41ff530bb328ba0cb87 tests: add test case for loading copied wallet twice (Chun Kuan Lee)
2d796faf62095e83f74337c26e7e1a8c3957cf3c wallet: Fix duplicate fileid (Chun Kuan Lee)
Pull request description:
The implementation in current master can not detect if the file ID is duplicate with flushed `BerkeleyEnvironment`. This PR would store the file ID in a global variable `g_fileids` and release it when the `BerkeleyDatabase` close. So it won't have to rely on a `Db*`.
Fix #14304
Tree-SHA512: 0632254b696bb4c671b5e2e5781e9012df54ba3c6ab0f919d9f6d31f374d3b0f8bd968b90b537884ac8c3d2906afdd58c2ce258666263464c7dbd636960b0e8f
Diffstat (limited to 'test/functional/wallet_multiwallet.py')
| -rwxr-xr-x | test/functional/wallet_multiwallet.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py index c9108ae797..74475753bb 100755 --- a/test/functional/wallet_multiwallet.py +++ b/test/functional/wallet_multiwallet.py @@ -230,6 +230,10 @@ class MultiWalletTest(BitcoinTestFramework): # Fail to load if one wallet is a copy of another assert_raises_rpc_error(-1, "BerkeleyBatch: Can't open database w8_copy (duplicates fileid", self.nodes[0].loadwallet, 'w8_copy') + # Fail to load if one wallet is a copy of another, test this twice to make sure that we don't re-introduce #14304 + assert_raises_rpc_error(-1, "BerkeleyBatch: Can't open database w8_copy (duplicates fileid", self.nodes[0].loadwallet, 'w8_copy') + + # Fail to load if wallet file is a symlink if os.name != 'nt': assert_raises_rpc_error(-4, "Wallet file verification failed: Invalid -wallet path 'w8_symlink'", self.nodes[0].loadwallet, 'w8_symlink') |