From 1e244d5145ebb024c03c023905e89e143c0bc2a2 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 6 Nov 2019 14:45:19 +1030 Subject: [PATCH] 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 --- tests/test_connection.py | 6 +++++- tests/test_pay.py | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/test_connection.py b/tests/test_connection.py index 6917403cdcdf..3ab6705fa736 100644 --- a/tests/test_connection.py +++ b/tests/test_connection.py @@ -2201,7 +2201,11 @@ def test_feerate_stress(node_factory, executor): @unittest.skipIf(not DEVELOPER, "need dev_disconnect") def test_pay_disconnect_stress(node_factory, executor): """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}, {'may_reconnect': True, 'disconnect': ['=WIRE_UPDATE_ADD_HTLC', diff --git a/tests/test_pay.py b/tests/test_pay.py index 5bdf0b03d483..1c5e13ab8367 100644 --- a/tests/test_pay.py +++ b/tests/test_pay.py @@ -1538,6 +1538,7 @@ def test_pay_variants(node_factory): @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): """Make sure pay command retries properly. """ def exhaust_channel(funder, fundee, scid, already_spent=0):