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: forward timeouts properly in send_blocks_and_test #14456

Merged
merged 1 commit into from Oct 20, 2018

Conversation

Projects
None yet
6 participants
@jamesob
Copy link
Member

commented Oct 10, 2018

Small change motivated by frustrations while writing feature_block tests; when a timeout is passed to send_blocks_and_test it isn't forwarded onto constituent waiting calls - you can end up waiting 60 seconds when you articulated e.g. 5. Respect the given timeout all the way down.

@fanquake fanquake added the Tests label Oct 10, 2018

@conscott
Copy link
Contributor

left a comment

Tested ACK 94e21c1

I suppose you could also add similiar logic to send_txs_and_test to make it uniform

@sipa

This comment has been minimized.

Copy link
Member

commented Oct 12, 2018

utACK

@fanquake fanquake requested a review from MarcoFalke Oct 20, 2018

@MarcoFalke MarcoFalke merged commit 94e21c1 into bitcoin:master Oct 20, 2018

2 checks passed

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

MarcoFalke added a commit that referenced this pull request Oct 20, 2018

Merge #14456: test: forward timeouts properly in send_blocks_and_test
94e21c1 test: forward timeouts properly in send_blocks_and_test (James O'Beirne)

Pull request description:

  Small change motivated by frustrations while writing `feature_block` tests; when a timeout is passed to `send_blocks_and_test` it isn't forwarded onto constituent waiting calls - you can end up waiting 60 seconds when you articulated e.g. 5. Respect the given timeout all the way down.

Tree-SHA512: 3a964764fc5e3431ae3b17bd642a27a1bd4526541a799ef63696c9dab0289a005a13d645770be6e46ea262d22a58f79d2b407293a39397b036f616fe20c21241
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.