HomePhabricator

Merge #14456: test: forward timeouts properly in send_blocks_and_test

Description

Merge #14456: test: forward timeouts properly in send_blocks_and_test

Summary:
94e21c1501 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

Backport of Core PR14456

Test Plan:

test_runner.py

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Differential Revision: https://reviews.bitcoinabc.org/D5821

Details

Provenance
MarcoFalke <falke.marco@gmail.com>Authored on Oct 20 2018, 06:15
jasonbcoxCommitted on Apr 24 2020, 15:23
jasonbcoxPushed on Apr 24 2020, 15:23
Reviewer
Restricted Project
Differential Revision
D5821: Merge #14456: test: forward timeouts properly in send_blocks_and_test
Parents
rABCe925b2dd0869: [backport#15288] Remove use of GetCountWithDescendants in wallet code
Branches
Unknown
Tags
Unknown