test: Increase debugging to hunt down mempool_reorg intermittent failure
This commit is contained in:
parent
b470c75847
commit
fac2fc4dd8
2 changed files with 12 additions and 8 deletions
|
@ -20,8 +20,6 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
|
|||
def skip_test_if_missing_module(self):
|
||||
self.skip_if_no_wallet()
|
||||
|
||||
alert_filename = None # Set by setup_network
|
||||
|
||||
def run_test(self):
|
||||
# Start with a 200 block chain
|
||||
assert_equal(self.nodes[0].getblockcount(), 200)
|
||||
|
@ -76,9 +74,8 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
|
|||
spend_101_id = self.nodes[0].sendrawtransaction(spend_101_raw)
|
||||
spend_102_1_id = self.nodes[0].sendrawtransaction(spend_102_1_raw)
|
||||
|
||||
self.sync_all(timeout=720)
|
||||
|
||||
assert_equal(set(self.nodes[0].getrawmempool()), {spend_101_id, spend_102_1_id, timelock_tx_id})
|
||||
self.sync_all()
|
||||
|
||||
for node in self.nodes:
|
||||
node.invalidateblock(last_block[0])
|
||||
|
@ -91,10 +88,9 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
|
|||
for node in self.nodes:
|
||||
node.invalidateblock(new_blocks[0])
|
||||
|
||||
self.sync_all(timeout=720)
|
||||
|
||||
# mempool should be empty.
|
||||
assert_equal(set(self.nodes[0].getrawmempool()), set())
|
||||
self.sync_all()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
|
@ -410,7 +410,10 @@ def sync_blocks(rpc_connections, *, wait=1, timeout=60):
|
|||
# Check that each peer has at least one connection
|
||||
assert (all([len(x.getpeerinfo()) for x in rpc_connections]))
|
||||
time.sleep(wait)
|
||||
raise AssertionError("Block sync timed out:{}".format("".join("\n {!r}".format(b) for b in best_hash)))
|
||||
raise AssertionError("Block sync timed out after {}s:{}".format(
|
||||
timeout,
|
||||
"".join("\n {!r}".format(b) for b in best_hash),
|
||||
))
|
||||
|
||||
|
||||
def sync_mempools(rpc_connections, *, wait=1, timeout=60, flush_scheduler=True):
|
||||
|
@ -429,11 +432,16 @@ def sync_mempools(rpc_connections, *, wait=1, timeout=60, flush_scheduler=True):
|
|||
# Check that each peer has at least one connection
|
||||
assert (all([len(x.getpeerinfo()) for x in rpc_connections]))
|
||||
time.sleep(wait)
|
||||
raise AssertionError("Mempool sync timed out:{}".format("".join("\n {!r}".format(m) for m in pool)))
|
||||
raise AssertionError("Mempool sync timed out after {}s:{}".format(
|
||||
timeout,
|
||||
"".join("\n {!r}".format(m) for m in pool),
|
||||
))
|
||||
|
||||
|
||||
# Transaction/Block functions
|
||||
#############################
|
||||
|
||||
|
||||
def find_output(node, txid, amount, *, blockhash=None):
|
||||
"""
|
||||
Return index to output of txid with value amount
|
||||
|
|
Loading…
Reference in a new issue