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>

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',

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):