Fix test locking issues and un-revert the probable-deadlines assertions commit #6534

Merged
merged 2 commits into from Aug 10, 2015

Conversation

Projects
None yet
2 participants
@theuni
Member

theuni commented Aug 7, 2015

Fixes #6515.

The rpc_addmultisig test was failing because cs_wallet was locked prior to rpc functions, upsetting the locking order.

The rpc_wallet test wasn't failing, but I dropped the lock on cs_wallet for consistency.

theuni added some commits Aug 7, 2015

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Aug 10, 2015

Member

ACK

Member

laanwj commented Aug 10, 2015

ACK

@laanwj laanwj merged commit 9493803 into bitcoin:master Aug 10, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Aug 10, 2015

Merge pull request #6534
9493803 Revert "Revert "Assert on probable deadlocks if the second lock isnt try_lock"" (Cory Fields)
605433f locks: don't lock cs_wallet before making rpc calls (Cory Fields)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment