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

test: Fix race in mempool_accept #14964

Merged
merged 1 commit into from Dec 17, 2018

Conversation

Projects
None yet
4 participants
@MarcoFalke
Copy link
Member

commented Dec 14, 2018

If we happen to pick the same random coin to spend, there would be mempool conflicts in some runs of the test. Fix that by popping from a static list of coins to spend from.

@MarcoFalke MarcoFalke added the Tests label Dec 14, 2018

@MarcoFalke MarcoFalke added this to the 0.18.0 milestone Dec 14, 2018

@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Dec 15, 2018

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #14939 (rpc: Allow testmempoolaccept to test unsigned transactions by lontivero)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@ken2812221
Copy link
Member

left a comment

utACK faee591

@promag

This comment has been minimized.

Copy link
Member

commented Dec 17, 2018

ACK faee591.

@MarcoFalke MarcoFalke merged commit faee591 into bitcoin:master Dec 17, 2018

1 of 2 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

MarcoFalke added a commit that referenced this pull request Dec 17, 2018

Merge #14964: test: Fix race in mempool_accept
faee591 test: Fix race in mempool_accept (MarcoFalke)

Pull request description:

  If we happen to pick the same random coin to spend, there would be mempool conflicts in some runs of the test. Fix that by popping from a static list of coins to spend from.

Tree-SHA512: f6fd37e43d919371aa8bc3a2c93b569f9169961fe702f3641bb63180c3a88f12ca1857e9ed4d3723d5f04ca8ab5ef009a90e679580f36246a10b987620a55bee

@MarcoFalke MarcoFalke deleted the MarcoFalke:Mf1812-testRaceMempoolAccept branch Dec 17, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.