HomePhabricator

[qa] Fix bug in compactblocks v2 merge

Description

[qa] Fix bug in compactblocks v2 merge

Bug caused the wait_for_block_announcement to be called on the wrong node,
leading to nondeterminism and occasional test failures. Bug was introduced in
merge commit:

d075479 Merge #8882: [qa] Fix race conditions in p2p-compactblocks.py and sendheaders.py

Underlying commits which conflicted were:

27acfc1 [qa] Update p2p-compactblocks.py for compactblocks v2
6976db2 [qa] Another attempt to fix race condition in p2p-compactblocks.py

The first commit changed the test_compactblock_construction function signature
and second commit added code which wasn't updated during the merge to use the
new arguments.

Suhas Daftuar <sdaftuar@chaincode.com> noticed the bug and suggested the fix.

Details

Provenance
Russell Yanofsky <russ@chaincode.com>Authored on Oct 24 2016, 19:33
Russell Yanofsky <russ@yanofsky.org>Committed on Nov 2 2016, 19:35
deadalnixPushed on May 14 2017, 22:04
Parents
rABC273bde37d867: Merge #9043: [qt] Return useful error message on ATMP failure
Branches
Unknown
Tags
Unknown

Event Timeline

Russell Yanofsky <russ@yanofsky.org> committed rABC47e9659ecfbe: [qa] Fix bug in compactblocks v2 merge (authored by Russell Yanofsky <russ@chaincode.com>).Nov 2 2016, 19:35