Skip to content

Commit 3b16637

Browse files
rustyrussellendothermicdev
authored andcommitted
pytest: fix race in test_autoclean
We can actually delete it before counters are updated: ``` wait_for(lambda: len(l3.rpc.listinvoices()['invoices']) == 2) > assert l3.rpc.autoclean_status()['autoclean']['expiredinvoices']['cleaned'] == 3 E assert 1 == 3 tests/test_plugin.py:3266: AssertionError ``` Signed-off-by: Rusty Russell <[email protected]>
1 parent 9c39410 commit 3b16637

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tests/test_plugin.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3263,7 +3263,7 @@ def test_autoclean(node_factory):
32633263
# Now enable: they will get autocleaned
32643264
l3.rpc.setconfig('autoclean-expiredinvoices-age', 2)
32653265
wait_for(lambda: len(l3.rpc.listinvoices()['invoices']) == 2)
3266-
assert l3.rpc.autoclean_status()['autoclean']['expiredinvoices']['cleaned'] == 3
3266+
wait_for(lambda: l3.rpc.autoclean_status()['autoclean']['expiredinvoices']['cleaned'] == 3)
32673267

32683268
# Reconnect, l1 pays invoice, we test paid expiry.
32693269
l2.rpc.connect(l3.info['id'], 'localhost', l3.port)
@@ -3281,15 +3281,15 @@ def test_autoclean(node_factory):
32813281

32823282
wait_for(lambda: l3.rpc.listinvoices()['invoices'] == [])
32833283
assert l3.rpc.autoclean_status()['autoclean']['expiredinvoices']['cleaned'] == 3
3284-
assert l3.rpc.autoclean_status()['autoclean']['paidinvoices']['cleaned'] == 1
3284+
wait_for(lambda: l3.rpc.autoclean_status()['autoclean']['paidinvoices']['cleaned'] == 1)
32853285

32863286
assert only_one(l1.rpc.listpays(inv5['bolt11'])['pays'])['status'] == 'failed'
32873287
assert only_one(l1.rpc.listpays(inv4['bolt11'])['pays'])['status'] == 'complete'
32883288
l1.rpc.setconfig('autoclean-failedpays-age', 1)
32893289
l1.rpc.setconfig('autoclean-cycle', 5)
32903290

32913291
wait_for(lambda: l1.rpc.listpays(inv5['bolt11'])['pays'] == [])
3292-
assert l1.rpc.autoclean_status()['autoclean']['failedpays']['cleaned'] == 1
3292+
wait_for(lambda: l1.rpc.autoclean_status()['autoclean']['failedpays']['cleaned'] == 1)
32933293
assert l1.rpc.autoclean_status()['autoclean']['succeededpays']['cleaned'] == 0
32943294

32953295
l1.rpc.setconfig('autoclean-succeededpays-age', 2)
@@ -3307,7 +3307,7 @@ def test_autoclean(node_factory):
33073307
wait_for(lambda: l2.rpc.listforwards(status='failed')['forwards'] == [])
33083308

33093309
assert len(l2.rpc.listforwards(status='settled')['forwards']) == 1
3310-
assert l2.rpc.autoclean_status()['autoclean']['failedforwards']['cleaned'] == 1
3310+
wait_for(lambda: l2.rpc.autoclean_status()['autoclean']['failedforwards']['cleaned'] == 1)
33113311
assert l2.rpc.autoclean_status()['autoclean']['succeededforwards']['cleaned'] == 0
33123312

33133313
amt_before = l2.rpc.getinfo()['fees_collected_msat']
@@ -3317,7 +3317,7 @@ def test_autoclean(node_factory):
33173317
wait_for(lambda: l2.rpc.listforwards(status='settled')['forwards'] == [])
33183318
assert l2.rpc.listforwards() == {'forwards': []}
33193319
assert l2.rpc.autoclean_status()['autoclean']['failedforwards']['cleaned'] == 1
3320-
assert l2.rpc.autoclean_status()['autoclean']['succeededforwards']['cleaned'] == 1
3320+
wait_for(lambda: l2.rpc.autoclean_status()['autoclean']['succeededforwards']['cleaned'] == 1)
33213321

33223322
# We still see correct total in getinfo!
33233323
assert l2.rpc.getinfo()['fees_collected_msat'] == amt_before

0 commit comments

Comments
 (0)