Add required locks in tests

laanwj · laanwj · commit ed6710056541 · 2014-04-23T08:05:05.000+02:00
Unit tests with DEBUG_LOCKORDER were running into assertions.
diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp
@@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
     // Test RPC calls for various wallet statistics
     Value r;
 
-    LOCK(pwalletMain->cs_wallet);
+    LOCK2(cs_main, pwalletMain->cs_wallet);
 
     BOOST_CHECK_NO_THROW(CallRPC("listunspent"));
     BOOST_CHECK_THROW(CallRPC("listunspent string"), runtime_error);
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
@@ -50,6 +50,7 @@ BOOST_AUTO_TEST_SUITE(script_P2SH_tests)
 
 BOOST_AUTO_TEST_CASE(sign)
 {
+    LOCK(cs_main);
     // Pay-to-script-hash looks like this:
     // scriptSig:    <sig> <sig...> <serialized_script>
     // scriptPubKey: HASH160 <hash> EQUAL
@@ -147,6 +148,7 @@ BOOST_AUTO_TEST_CASE(norecurse)
 
 BOOST_AUTO_TEST_CASE(set)
 {
+    LOCK(cs_main);
     // Test the CScript::Set* methods
     CBasicKeyStore keystore;
     CKey key[4];
@@ -250,6 +252,7 @@ BOOST_AUTO_TEST_CASE(switchover)
 
 BOOST_AUTO_TEST_CASE(AreInputsStandard)
 {
+    LOCK(cs_main);
     CCoinsView coinsDummy;
     CCoinsViewCache coins(coinsDummy);
     CBasicKeyStore keystore;
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
@@ -254,6 +254,7 @@ BOOST_AUTO_TEST_CASE(test_Get)
 
 BOOST_AUTO_TEST_CASE(test_IsStandard)
 {
+    LOCK(cs_main);
     CBasicKeyStore keystore;
     CCoinsView coinsDummy;
     CCoinsViewCache coins(coinsDummy);

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ BOOST_AUTO_TEST_SUITE(script_P2SH_tests)`
`50`	`50`
`51`	`51`	`BOOST_AUTO_TEST_CASE(sign)`
`52`	`52`	`{`
	`53`	`+ LOCK(cs_main);`
`53`	`54`	`// Pay-to-script-hash looks like this:`
`54`	`55`	`// scriptSig: <sig> <sig...> <serialized_script>`
`55`	`56`	`// scriptPubKey: HASH160 <hash> EQUAL`
`@@ -147,6 +148,7 @@ BOOST_AUTO_TEST_CASE(norecurse)`
`147`	`148`
`148`	`149`	`BOOST_AUTO_TEST_CASE(set)`
`149`	`150`	`{`
	`151`	`+ LOCK(cs_main);`
`150`	`152`	`// Test the CScript::Set* methods`
`151`	`153`	`CBasicKeyStore keystore;`
`152`	`154`	`CKey key[4];`
`@@ -250,6 +252,7 @@ BOOST_AUTO_TEST_CASE(switchover)`
`250`	`252`
`251`	`253`	`BOOST_AUTO_TEST_CASE(AreInputsStandard)`
`252`	`254`	`{`
	`255`	`+ LOCK(cs_main);`
`253`	`256`	`CCoinsView coinsDummy;`
`254`	`257`	`CCoinsViewCache coins(coinsDummy);`
`255`	`258`	`CBasicKeyStore keystore;`
Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,7 @@ BOOST_AUTO_TEST_CASE(test_Get)`
`254`	`254`
`255`	`255`	`BOOST_AUTO_TEST_CASE(test_IsStandard)`
`256`	`256`	`{`
	`257`	`+ LOCK(cs_main);`
`257`	`258`	`CBasicKeyStore keystore;`
`258`	`259`	`CCoinsView coinsDummy;`
`259`	`260`	`CCoinsViewCache coins(coinsDummy);`