mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-03 18:57:06 +01:00
Code Issues Projects Releases Wiki Activity

pytest: Make test_pay_retry less flaky for liquid-regtest

Browse source
This commit is contained in:
Christian Decker 2020-03-03 17:55:11 +01:00 • committed by Rusty Russell
parent 5532305d76
commit 9736c7bfd0
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/test_pay.py
View file

@ -8,8 +8,6 @@ from utils import (
DEVELOPER, wait_for, only_one, sync_blockheight, SLOW_MACHINE, TIMEOUT, DEVELOPER, wait_for, only_one, sync_blockheight, SLOW_MACHINE, TIMEOUT,
VALGRIND VALGRIND
) )
import concurrent.futures
import copy import copy
import os import os
import pytest import pytest
@ -1549,14 +1547,17 @@ def test_pay_variants(node_factory):
@unittest.skipIf(not DEVELOPER, "gossip without DEVELOPER=1 is slow") @unittest.skipIf(not DEVELOPER, "gossip without DEVELOPER=1 is slow")
@unittest.skipIf(VALGRIND and SLOW_MACHINE, "Travis times out under valgrind") @unittest.skipIf(VALGRIND and SLOW_MACHINE, "Travis times out under valgrind")
def test_pay_retry(node_factory, bitcoind): def test_pay_retry(node_factory, bitcoind, executor, chainparams):
"""Make sure pay command retries properly. """ """Make sure pay command retries properly. """
def exhaust_channel(funder, fundee, scid, already_spent=0): def exhaust_channel(funder, fundee, scid, already_spent=0):
"""Spend all available capacity (10^6 - 1%) of channel""" """Spend all available capacity (10^6 - 1%) of channel
maxpay = (10**6 - 10**6 // 100 - 16020) * 1000 - already_spent """
inv = fundee.rpc.invoice(maxpay, peer = funder.rpc.listpeers(fundee.info['id'])['peers'][0]
''.join(random.choice(string.ascii_letters + string.digits) for _ in range(20)), chan = peer['channels'][0]
"exhaust_channel") maxpay = chan['spendable_msatoshi']
lbl = ''.join(random.choice(string.ascii_letters) for _ in range(20))
inv = fundee.rpc.invoice(maxpay, lbl, "exhaust_channel")
routestep = { routestep = {
'msatoshi': maxpay, 'msatoshi': maxpay,
'id': fundee.info['id'], 'id': fundee.info['id'],
@ -1607,7 +1608,6 @@ def test_pay_retry(node_factory, bitcoind):
# Make sure listpays doesn't transiently show failure while pay # Make sure listpays doesn't transiently show failure while pay
# is retrying. # is retrying.
executor = concurrent.futures.ThreadPoolExecutor()
fut = executor.submit(listpays_nofail, inv['bolt11']) fut = executor.submit(listpays_nofail, inv['bolt11'])
# Pay l1->l5 should succeed via straight line (eventually) # Pay l1->l5 should succeed via straight line (eventually)