[qa] Wait for specific block announcement in p2p-compactblocks
Change check_announcement_of_new_block() to wait specifically for the
announcement of the newly created block, instead of waiting for any
announcement at all. A difficult to reproduce failure in
check_announcement_of_new_block() that happened in a travis build
(https://travis-ci.org/bitcoin/bitcoin/jobs/175198367) might have happened
because an older announcement was mistaken for the expected one. The error
looked like:
Assertion failed: Failed
File ".../bitcoin/qa/rpc-tests/test_framework/test_framework.py", line 145, in main
self.run_test()
File ".../bitcoin/build/../qa/rpc-tests/p2p-compactblocks.py", line 787, in run_test
self.test_sendcmpct(self.nodes[1], self.segwit_node, 2, old_node=self.old_node)
File ".../bitcoin/build/../qa/rpc-tests/p2p-compactblocks.py", line 201, in test_sendcmpct
check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is None and p.last_inv is not None)
File ".../bitcoin/build/../qa/rpc-tests/p2p-compactblocks.py", line 194, in check_announcement_of_new_block
assert(predicate(peer))
This commit also changes the assertion failed message above to include more
detailed information for debug.
Github-Pull: #9159
Rebased-From: dfa44d1b07
This commit is contained in:
parent
dccdc3aa34
commit
eca9b46537
|
@ -186,12 +186,15 @@ class CompactBlocksTest(BitcoinTestFramework):
|
||||||
|
|
||||||
def check_announcement_of_new_block(node, peer, predicate):
|
def check_announcement_of_new_block(node, peer, predicate):
|
||||||
peer.clear_block_announcement()
|
peer.clear_block_announcement()
|
||||||
node.generate(1)
|
block_hash = int(node.generate(1)[0], 16)
|
||||||
got_message = wait_until(lambda: peer.block_announced, timeout=30)
|
peer.wait_for_block_announcement(block_hash, timeout=30)
|
||||||
assert(peer.block_announced)
|
assert(peer.block_announced)
|
||||||
assert(got_message)
|
assert(got_message)
|
||||||
|
|
||||||
with mininode_lock:
|
with mininode_lock:
|
||||||
assert(predicate(peer))
|
assert predicate(peer), (
|
||||||
|
"block_hash={!r}, cmpctblock={!r}, inv={!r}".format(
|
||||||
|
block_hash, peer.last_cmpctblock, peer.last_inv))
|
||||||
|
|
||||||
# We shouldn't get any block announcements via cmpctblock yet.
|
# We shouldn't get any block announcements via cmpctblock yet.
|
||||||
check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is None)
|
check_announcement_of_new_block(node, test_node, lambda p: p.last_cmpctblock is None)
|
||||||
|
|
Loading…
Reference in New Issue