pytest: two more timeouts on Travis.

Reduce test_feerate_stress iterations, and simply don't run
test_pay_retry under VALGRIND with SLOW_MACHINE at all.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-11-06 14:45:19 +10:30
parent 5a8677edc6
commit a70f2dc650
2 changed files with 6 additions and 1 deletions

View File

@@ -2201,7 +2201,11 @@ def test_feerate_stress(node_factory, executor):
@unittest.skipIf(not DEVELOPER, "need dev_disconnect") @unittest.skipIf(not DEVELOPER, "need dev_disconnect")
def test_pay_disconnect_stress(node_factory, executor): def test_pay_disconnect_stress(node_factory, executor):
"""Expose race in htlc restoration in channeld: 50% chance of failure""" """Expose race in htlc restoration in channeld: 50% chance of failure"""
for i in range(5): if SLOW_MACHINE and VALGRIND:
NUM_RUNS = 2
else:
NUM_RUNS = 5
for i in range(NUM_RUNS):
l1, l2 = node_factory.line_graph(2, opts=[{'may_reconnect': True}, l1, l2 = node_factory.line_graph(2, opts=[{'may_reconnect': True},
{'may_reconnect': True, {'may_reconnect': True,
'disconnect': ['=WIRE_UPDATE_ADD_HTLC', 'disconnect': ['=WIRE_UPDATE_ADD_HTLC',

View File

@@ -1538,6 +1538,7 @@ 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")
def test_pay_retry(node_factory, bitcoind): def test_pay_retry(node_factory, bitcoind):
"""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):