diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-11-09 15:58:19 -0500 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2018-11-30 22:40:57 +0800 |
| commit | f9db08e8ca6821147e12db772d15de106d8c8375 (patch) | |
| tree | 2e447104b02d7e42e7c3efeae19d197841d7696e /test | |
| parent | 79358817e53ac0a7afa64c747115d492a74e3155 (diff) | |
| download | bitcoin-f9db08e8ca6821147e12db772d15de106d8c8375.tar.xz | |
qa: Avoid race in p2p_invalid_block by waiting for the block request
Github-Pull: #14700
Rebased-From: fa2156820877caf70fc09c7e6244b7cde6ebaf29
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/p2p_invalid_block.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/p2p_invalid_block.py b/test/functional/p2p_invalid_block.py index 0a7b83ed73..a46b0a02a6 100755 --- a/test/functional/p2p_invalid_block.py +++ b/test/functional/p2p_invalid_block.py @@ -80,9 +80,9 @@ class InvalidBlockRequestTest(BitcoinTestFramework): block2.vtx.append(tx2) assert_equal(block2.hashMerkleRoot, block2.calc_merkle_root()) assert_equal(orig_hash, block2.rehash()) - assert(block2_orig.vtx != block2.vtx) + assert block2_orig.vtx != block2.vtx - node.p2p.send_blocks_and_test([block2], node, success=False, request_block=False, reject_code=16, reject_reason=b'bad-txns-duplicate') + node.p2p.send_blocks_and_test([block2], node, success=False, reject_code=16, reject_reason=b'bad-txns-duplicate') # Check transactions for duplicate inputs self.log.info("Test duplicate input block.") @@ -92,7 +92,7 @@ class InvalidBlockRequestTest(BitcoinTestFramework): block2_orig.hashMerkleRoot = block2_orig.calc_merkle_root() block2_orig.rehash() block2_orig.solve() - node.p2p.send_blocks_and_test([block2_orig], node, success=False, request_block=False, reject_reason=b'bad-txns-inputs-duplicate') + node.p2p.send_blocks_and_test([block2_orig], node, success=False, reject_reason=b'bad-txns-inputs-duplicate') self.log.info("Test very broken block.") @@ -105,7 +105,7 @@ class InvalidBlockRequestTest(BitcoinTestFramework): block3.rehash() block3.solve() - node.p2p.send_blocks_and_test([block3], node, success=False, request_block=False, reject_code=16, reject_reason=b'bad-cb-amount') + node.p2p.send_blocks_and_test([block3], node, success=False, reject_code=16, reject_reason=b'bad-cb-amount') if __name__ == '__main__': InvalidBlockRequestTest().main() |