diff options
| author | Gavin Andresen <[email protected]> | 2014-01-24 11:46:00 -0800 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2014-01-24 11:46:00 -0800 |
| commit | d3d753578c1043ce3755f097ce96cc2388a08738 (patch) | |
| tree | 49585a6d81c8bd6fe625d49f8a4eee318a3d6da6 /src/test/rpc_wallet_tests.cpp | |
| parent | Merge pull request #3571 (diff) | |
| parent | Unit test fixes for AssertLockHeld / -DDEBUG_LOCKORDER (diff) | |
| download | discoin-d3d753578c1043ce3755f097ce96cc2388a08738.tar.xz discoin-d3d753578c1043ce3755f097ce96cc2388a08738.zip | |
Merge pull request #3578 from gavinandresen/unittest_debuglockorder
Unit test fixes for AssertLockHeld / -DDEBUG_LOCKORDER
Diffstat (limited to 'src/test/rpc_wallet_tests.cpp')
| -rw-r--r-- | src/test/rpc_wallet_tests.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp index 2cf0fb350..628ba9506 100644 --- a/src/test/rpc_wallet_tests.cpp +++ b/src/test/rpc_wallet_tests.cpp @@ -2,6 +2,7 @@ #include "rpcclient.h" #include "base58.h" +#include "wallet.h" #include <boost/algorithm/string.hpp> #include <boost/test/unit_test.hpp> @@ -12,10 +13,14 @@ using namespace json_spirit; extern Array createArgs(int nRequired, const char* address1=NULL, const char* address2=NULL); extern Value CallRPC(string args); +extern CWallet* pwalletMain; + BOOST_AUTO_TEST_SUITE(rpc_wallet_tests) BOOST_AUTO_TEST_CASE(rpc_addmultisig) { + LOCK(pwalletMain->cs_wallet); + rpcfn_type addmultisig = tableRPC["addmultisigaddress"]->actor; // old, 65-byte-long: @@ -56,6 +61,8 @@ BOOST_AUTO_TEST_CASE(rpc_wallet) // Test RPC calls for various wallet statistics Value r; + LOCK(pwalletMain->cs_wallet); + BOOST_CHECK_NO_THROW(CallRPC("listunspent")); BOOST_CHECK_THROW(CallRPC("listunspent string"), runtime_error); BOOST_CHECK_THROW(CallRPC("listunspent 0 string"), runtime_error); |