Skip to content

pytest: fix flakes in test_splicing_rbf, test_reconnect_signed, test_htlc_no_force_close #8402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 11, 2025
Merged

pytest: fix flakes in test_splicing_rbf, test_reconnect_signed, test_htlc_no_force_close #8402

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd99c2c
pytest: fix flake in test_splicing_rbf
rustyrussell Jul 9, 2025
19ae86f
pytest: really fix flake in test_reconnect_signed
rustyrussell Jul 9, 2025
a828622
pytest: avoid bad gossip flake in test_htlc_no_force_close
rustyrussell Jul 10, 2025
2a61a9c
pytest: add debug print to diagnose flake in test_peer_anchor_push
rustyrussell Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions tests/test_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,12 +654,13 @@ def test_disconnect_half_signed_v2(node_factory):
@pytest.mark.openchannel('v2')
def test_reconnect_signed(node_factory):
# This will fail *after* both sides consider channel opening.
disconnects = ['<WIRE_FUNDING_SIGNED']
if EXPERIMENTAL_DUAL_FUND:
disconnects = ['<WIRE_COMMITMENT_SIGNED']

l1 = node_factory.get_node(may_reconnect=True, disconnect=disconnects)
l2 = node_factory.get_node(may_reconnect=True)
# Definitely in DUALOPEND_OPEN_COMMITTED once it's trying to send this.
l1 = node_factory.get_node(may_reconnect=True)
l2 = node_factory.get_node(may_reconnect=True, disconnect=['-WIRE_TX_SIGNATURES'])
else:
l1 = node_factory.get_node(may_reconnect=True, disconnect=['<WIRE_FUNDING_SIGNED'])
l2 = node_factory.get_node(may_reconnect=True)

l1.fundwallet(2000000)

Expand Down
3 changes: 3 additions & 0 deletions tests/test_splicing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ def test_splice_rbf(node_factory, bitcoind):
inv = l2.rpc.invoice(10**2, '2', 'no_2')
l1.rpc.pay(inv['bolt11'])

# Make sure l1 doesn't unilateral close if HTLC hasn't completely settled before deadline.
wait_for(lambda: only_one(l1.rpc.listpeerchannels()['channels'])['htlcs'] == [])
Copy link
Collaborator

@ddustin ddustin Jul 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah cool didn't know we had a way to do this 👍


bitcoind.generate_block(6, wait_for_mempool=1)

l2.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL')
Expand Down
Loading