diff options
author | Suhas Daftuar <sdaftuar@chaincode.com> | 2016-01-14 20:35:21 -0500 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-18 10:29:32 +0100 |
commit | 1488fc8eac3ab8ed58d84c6bd61b5295b01de295 (patch) | |
tree | fc5bba7534b5050e860e1c5b1d1f297c3846a88c /qa/rpc-tests | |
parent | d7c54c5a9db6123e0987e8ba23efe395e1dc1a85 (diff) | |
download | bitcoin-1488fc8eac3ab8ed58d84c6bd61b5295b01de295.tar.xz |
Eliminate race condition in mempool_packages test
Github-Pull: #7368
Rebased-From: 4d10d2e16fb837abe304e0a5d3bc0a41941d917a
Diffstat (limited to 'qa/rpc-tests')
-rwxr-xr-x | qa/rpc-tests/mempool_packages.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/qa/rpc-tests/mempool_packages.py b/qa/rpc-tests/mempool_packages.py index 063308d394..47c1028b9f 100755 --- a/qa/rpc-tests/mempool_packages.py +++ b/qa/rpc-tests/mempool_packages.py @@ -87,9 +87,18 @@ class MempoolPackagesTest(BitcoinTestFramework): print "too-long-ancestor-chain successfully rejected" # Check that prioritising a tx before it's added to the mempool works + # First clear the mempool by mining a block. self.nodes[0].generate(1) + sync_blocks(self.nodes) + assert_equal(len(self.nodes[0].getrawmempool()), 0) + # Prioritise a transaction that has been mined, then add it back to the + # mempool by using invalidateblock. self.nodes[0].prioritisetransaction(chain[-1], 0, 2000) self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash()) + # Keep node1's tip synced with node0 + self.nodes[1].invalidateblock(self.nodes[1].getbestblockhash()) + + # Now check that the transaction is in the mempool, with the right modified fee mempool = self.nodes[0].getrawmempool(True) descendant_fees = 0 |