diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-11-24 17:28:15 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-11-24 17:28:19 +0100 |
| commit | 3fae2f95f14d285c792e03d9f0995c449a1cc758 (patch) | |
| tree | c3e37587add2e0b94d9d7954568cf86936e476b2 /test | |
| parent | bf9548bc59458c997baa8b2818c33f399559168a (diff) | |
| parent | b1f59d55d920d2b35269b474762f94fec87bfb16 (diff) | |
| download | bitcoin-3fae2f95f14d285c792e03d9f0995c449a1cc758.tar.xz | |
Merge #20475: [backport] RPC: unloadwallet: Clarify docs/error when both the RPC endpoint and wallet_name parameter specify a wallet
b1f59d55d920d2b35269b474762f94fec87bfb16 RPC/Wallet: unloadwallet: Clarify docs/error when both the RPC endpoint and wallet_name parameter specify a wallet (Luke Dashjr)
Pull request description:
Github-Pull: #20462
Rebased-From: b1f59d55d920d2b35269b474762f94fec87bfb16
Top commit has no ACKs.
Tree-SHA512: 2ee0a8a280f56baf196a3a48a59620f297075d23898e6aa3b3e677cdde74826688614d27a477a1448306234c2109fa39083946f691ced10d8bbc53006730784e
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/wallet_multiwallet.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py index df16ec741f..0d715b3130 100755 --- a/test/functional/wallet_multiwallet.py +++ b/test/functional/wallet_multiwallet.py @@ -355,7 +355,8 @@ class MultiWalletTest(BitcoinTestFramework): assert_raises_rpc_error(-1, "JSON value is not a string as expected", self.nodes[0].unloadwallet) assert_raises_rpc_error(-18, "Requested wallet does not exist or is not loaded", self.nodes[0].unloadwallet, "dummy") assert_raises_rpc_error(-18, "Requested wallet does not exist or is not loaded", node.get_wallet_rpc("dummy").unloadwallet) - assert_raises_rpc_error(-8, "Cannot unload the requested wallet", w1.unloadwallet, "w2"), + assert_raises_rpc_error(-8, "Both the RPC endpoint wallet and wallet_name parameter were provided (only one allowed)", w1.unloadwallet, "w2"), + assert_raises_rpc_error(-8, "Both the RPC endpoint wallet and wallet_name parameter were provided (only one allowed)", w1.unloadwallet, "w1"), # Successfully unload the specified wallet name self.nodes[0].unloadwallet("w1") |