diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-10-20 03:15:10 -0300 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-10-20 03:15:13 -0300 |
| commit | d433239a8d549762ae8715bda9ab0f641927198c (patch) | |
| tree | 5ffa1b51e8f75ab9051b72f1dde7e01eb6300a6d /test | |
| parent | 544f3234384b2f6c290e987ad18576e1b50d7db9 (diff) | |
| parent | 94e21c1501660e16d6d6bff94265bf910102b8a1 (diff) | |
| download | bitcoin-d433239a8d549762ae8715bda9ab0f641927198c.tar.xz | |
Merge #14456: test: forward timeouts properly in send_blocks_and_test
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
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/test_framework/mininode.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index f8caa57250..6864e8a838 100755 --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -500,9 +500,9 @@ class P2PDataStore(P2PInterface): wait_until(lambda: blocks[-1].sha256 in self.getdata_requests, timeout=timeout, lock=mininode_lock) if expect_disconnect: - self.wait_for_disconnect() + self.wait_for_disconnect(timeout=timeout) else: - self.sync_with_ping() + self.sync_with_ping(timeout=timeout) if success: wait_until(lambda: node.getbestblockhash() == blocks[-1].hash, timeout=timeout) |