Merge #10365: [tests] increase timeouts in sendheaders test
56befa0
[tests] increase timeouts in sendheaders test (John Newbery)b0bfa23
[tests] Make wait_until timeout 60 seconds by default (John Newbery) Tree-SHA512: ca68ad91a7cabb0673f230631a9f2196a4a394cf7cea7a266b3dad3923f7887d2a192ceedd68f7a4a06d105a7d13870e75e971193b93476f8d72b34639d7c3d1
This commit is contained in:
commit
7ee5236048
2 changed files with 10 additions and 8 deletions
|
@ -243,7 +243,7 @@ class SendHeadersTest(BitcoinTestFramework):
|
||||||
if i == 0:
|
if i == 0:
|
||||||
# first request the block
|
# first request the block
|
||||||
test_node.get_data([tip])
|
test_node.get_data([tip])
|
||||||
test_node.wait_for_block(tip, timeout=5)
|
test_node.wait_for_block(tip)
|
||||||
elif i == 1:
|
elif i == 1:
|
||||||
# next try requesting header and block
|
# next try requesting header and block
|
||||||
test_node.get_headers(locator=[old_tip], hashstop=tip)
|
test_node.get_headers(locator=[old_tip], hashstop=tip)
|
||||||
|
@ -258,7 +258,7 @@ class SendHeadersTest(BitcoinTestFramework):
|
||||||
new_block = create_block(tip, create_coinbase(height+1), block_time)
|
new_block = create_block(tip, create_coinbase(height+1), block_time)
|
||||||
new_block.solve()
|
new_block.solve()
|
||||||
test_node.send_header_for_blocks([new_block])
|
test_node.send_header_for_blocks([new_block])
|
||||||
test_node.wait_for_getdata([new_block.sha256], timeout=5)
|
test_node.wait_for_getdata([new_block.sha256])
|
||||||
test_node.send_message(msg_block(new_block))
|
test_node.send_message(msg_block(new_block))
|
||||||
test_node.sync_with_ping() # make sure this block is processed
|
test_node.sync_with_ping() # make sure this block is processed
|
||||||
inv_node.clear_last_announcement()
|
inv_node.clear_last_announcement()
|
||||||
|
@ -297,18 +297,18 @@ class SendHeadersTest(BitcoinTestFramework):
|
||||||
if j == 0:
|
if j == 0:
|
||||||
# Announce via inv
|
# Announce via inv
|
||||||
test_node.send_block_inv(tip)
|
test_node.send_block_inv(tip)
|
||||||
test_node.wait_for_getheaders(timeout=5)
|
test_node.wait_for_getheaders()
|
||||||
# Should have received a getheaders now
|
# Should have received a getheaders now
|
||||||
test_node.send_header_for_blocks(blocks)
|
test_node.send_header_for_blocks(blocks)
|
||||||
# Test that duplicate inv's won't result in duplicate
|
# Test that duplicate inv's won't result in duplicate
|
||||||
# getdata requests, or duplicate headers announcements
|
# getdata requests, or duplicate headers announcements
|
||||||
[ inv_node.send_block_inv(x.sha256) for x in blocks ]
|
[ inv_node.send_block_inv(x.sha256) for x in blocks ]
|
||||||
test_node.wait_for_getdata([x.sha256 for x in blocks], timeout=5)
|
test_node.wait_for_getdata([x.sha256 for x in blocks])
|
||||||
inv_node.sync_with_ping()
|
inv_node.sync_with_ping()
|
||||||
else:
|
else:
|
||||||
# Announce via headers
|
# Announce via headers
|
||||||
test_node.send_header_for_blocks(blocks)
|
test_node.send_header_for_blocks(blocks)
|
||||||
test_node.wait_for_getdata([x.sha256 for x in blocks], timeout=5)
|
test_node.wait_for_getdata([x.sha256 for x in blocks])
|
||||||
# Test that duplicate headers won't result in duplicate
|
# Test that duplicate headers won't result in duplicate
|
||||||
# getdata requests (the check is further down)
|
# getdata requests (the check is further down)
|
||||||
inv_node.send_header_for_blocks(blocks)
|
inv_node.send_header_for_blocks(blocks)
|
||||||
|
@ -495,7 +495,7 @@ class SendHeadersTest(BitcoinTestFramework):
|
||||||
with mininode_lock:
|
with mininode_lock:
|
||||||
test_node.last_message.pop("getheaders", None)
|
test_node.last_message.pop("getheaders", None)
|
||||||
test_node.send_header_for_blocks([blocks[1]])
|
test_node.send_header_for_blocks([blocks[1]])
|
||||||
test_node.wait_for_getheaders(timeout=1)
|
test_node.wait_for_getheaders()
|
||||||
test_node.send_header_for_blocks(blocks)
|
test_node.send_header_for_blocks(blocks)
|
||||||
test_node.wait_for_getdata([x.sha256 for x in blocks])
|
test_node.wait_for_getdata([x.sha256 for x in blocks])
|
||||||
[ test_node.send_message(msg_block(x)) for x in blocks ]
|
[ test_node.send_message(msg_block(x)) for x in blocks ]
|
||||||
|
@ -518,7 +518,7 @@ class SendHeadersTest(BitcoinTestFramework):
|
||||||
with mininode_lock:
|
with mininode_lock:
|
||||||
test_node.last_message.pop("getheaders", None)
|
test_node.last_message.pop("getheaders", None)
|
||||||
test_node.send_header_for_blocks([blocks[i]])
|
test_node.send_header_for_blocks([blocks[i]])
|
||||||
test_node.wait_for_getheaders(timeout=1)
|
test_node.wait_for_getheaders()
|
||||||
|
|
||||||
# Next header will connect, should re-set our count:
|
# Next header will connect, should re-set our count:
|
||||||
test_node.send_header_for_blocks([blocks[0]])
|
test_node.send_header_for_blocks([blocks[0]])
|
||||||
|
@ -533,7 +533,7 @@ class SendHeadersTest(BitcoinTestFramework):
|
||||||
with mininode_lock:
|
with mininode_lock:
|
||||||
test_node.last_message.pop("getheaders", None)
|
test_node.last_message.pop("getheaders", None)
|
||||||
test_node.send_header_for_blocks([blocks[i%len(blocks)]])
|
test_node.send_header_for_blocks([blocks[i%len(blocks)]])
|
||||||
test_node.wait_for_getheaders(timeout=1)
|
test_node.wait_for_getheaders()
|
||||||
|
|
||||||
# Eventually this stops working.
|
# Eventually this stops working.
|
||||||
test_node.send_header_for_blocks([blocks[-1]])
|
test_node.send_header_for_blocks([blocks[-1]])
|
||||||
|
|
|
@ -1358,6 +1358,8 @@ class msg_reject(object):
|
||||||
|
|
||||||
# Helper function
|
# Helper function
|
||||||
def wait_until(predicate, *, attempts=float('inf'), timeout=float('inf')):
|
def wait_until(predicate, *, attempts=float('inf'), timeout=float('inf')):
|
||||||
|
if attempts == float('inf') and timeout == float('inf'):
|
||||||
|
timeout = 60
|
||||||
attempt = 0
|
attempt = 0
|
||||||
elapsed = 0
|
elapsed = 0
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue