Skip to content

Commit e0ad847

Browse files
committed
Merge bitcoin/bitcoin#28321: test: Fix intermittent issue in mempool_reorg
fa5cc3c test: Fix intermittent issue in mempool_reorg (MarcoFalke) Pull request description: Currently the test case may fail intermittently, see bitcoin/bitcoin#28313 Fix this by changing a number and reducing the failure rate a bit. ACKs for top commit: glozow: ACK fa5cc3c Tree-SHA512: ff552111b434ca712c7dbdc5ba32a986a6fa4512cba5a756234eae69428063bf6ecfdc8f350ee84226ed4d3e4262b4639dbe49162a722e8da85f0d61e5690c51
2 parents cd5d2f5 + fa5cc3c commit e0ad847

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

test/functional/mempool_reorg.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ def test_reorg_relay(self):
6868
assert_equal(self.nodes[1].getmempoolentry(tx_child["txid"])["ancestorcount"], 2)
6969
assert_equal(self.nodes[1].getmempoolentry(tx_before_reorg["txid"])["ancestorcount"], 1)
7070

71-
# peer1 should not have received an inv for any of the transactions during this time, as not
72-
# enough time has elapsed for those transactions to be announced. Likewise, it cannot
71+
# peer1 should not have received an inv for any of the transactions during this time, as no
72+
# mocktime has elapsed for those transactions to be announced. Likewise, it cannot
7373
# request very recent, unanounced transactions.
7474
assert_equal(len(peer1.get_invs()), 0)
7575
# It's too early to request these two transactions
@@ -92,7 +92,7 @@ def test_reorg_relay(self):
9292
# However, the node will answer requests for the tx from the recently-disconnected block.
9393
assert_equal(peer1.last_message["tx"].tx.getwtxid(),tx_disconnected["tx"].getwtxid())
9494

95-
self.nodes[1].setmocktime(int(time.time()) + 30)
95+
self.nodes[1].setmocktime(int(time.time()) + 300)
9696
peer1.sync_with_ping()
9797
# the transactions are now announced
9898
assert_equal(len(peer1.get_invs()), 3)

0 commit comments

Comments
 (0)