Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from Aug 10, 2015

Conversation

@theuni
Copy link
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 2 commits Aug 7, 2015
…try_lock""

This reverts commit a4fe57d.

The issue here should be fixed by the previous commit.
@laanwj
Copy link
Member

laanwj commented Aug 10, 2015

ACK

@laanwj laanwj merged commit 9493803 into bitcoin:master Aug 10, 2015
1 check passed
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
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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.