Skip to content

pytest: fix flakes #7021

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
rustyrussell merged 2 commits into from
Jan 29, 2024
Merged

pytest: fix flakes #7021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce2d5c9
pytest: fix flake in test_custommsg_triggers_notification
rustyrussell Jan 28, 2024
caa4a68
pytest: fix flake in test_peer_anchor_push
rustyrussell Jan 29, 2024
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
5 changes: 4 additions & 1 deletion tests/test_closing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3919,7 +3919,7 @@ def test_peer_anchor_push(node_factory, bitcoind, executor, chainparams):
psbt = l2.rpc.addpsbtoutput(OUTPUT_SAT, psbt)['psbt']
l2.rpc.sendpsbt(l2.rpc.signpsbt(psbt)['signed_psbt'])
bitcoind.generate_block(1, wait_for_mempool=1)
sync_blockheight(bitcoind, [l2])
sync_blockheight(bitcoind, [l1, l2])

# Make sure all amounts are below OUTPUT_SAT sats!
assert [x for x in l2.rpc.listfunds()['outputs'] if x['amount_msat'] > Millisatoshi(str(OUTPUT_SAT) + "sat")] == []
Expand All @@ -3931,6 +3931,9 @@ def test_peer_anchor_push(node_factory, bitcoind, executor, chainparams):
l1.rpc.sendpay(route, sticky_inv['payment_hash'], payment_secret=sticky_inv['payment_secret'])
l3.daemon.wait_for_log('dev_disconnect: -WIRE_UPDATE_FULFILL_HTLC')

# Make sure HTLC expiry is what we expect!
l2.daemon.wait_for_log('Adding HTLC 0 amount=100000000msat cltv=119 gave CHANNEL_ERR_ADD_OK')

# l3 drops to chain, but make sure it doesn't CPFP its own anchor.
wait_for(lambda: only_one(l3.rpc.listpeerchannels(l2.info['id'])['channels'])['htlcs'] != [])
closetx = l3.rpc.dev_sign_last_tx(l2.info['id'])['tx']
Expand Down
2 changes: 1 addition & 1 deletion tests/test_misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2687,7 +2687,7 @@ def test_custommsg_triggers_notification(node_factory):

# Connect l1 to l2
l1.connect(l2)
wait_for(lambda: l2.rpc.listpeers(l1.info['id'])['peers'][0]['connected'])
wait_for(lambda: [p['connected'] for p in l2.rpc.listpeers(l1.info['id'])['peers']] == [True])

# Send a custommsg from l2 to l1
# The message id 7777 is chosen to be sufficiently high and shouldn't be used by the
Expand Down