From aab91557f37043f090ef4ad6d9670dac8baacec6 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Sun, 28 Oct 2018 22:06:58 +1030
Subject: [PATCH] Travis: eliminate 4 slowest tests, with new SLOW_MACHINE
 flag.

In one case we can reduce, in the others we eliminated if VALGRIND.

Here are the ten slowest tests on my laptop:

469.75s call     tests/test_closing.py::test_closing_torture
243.61s call     tests/test_closing.py::test_onchain_multihtlc_our_unilateral
222.73s call     tests/test_closing.py::test_onchain_multihtlc_their_unilateral
217.80s call     tests/test_closing.py::test_closing_different_fees
146.14s call     tests/test_connection.py::test_dataloss_protection
138.93s call     tests/test_connection.py::test_restart_many_payments
129.66s call     tests/test_gossip.py::test_gossip_persistence
128.73s call     tests/test_connection.py::test_no_fee_estimate
122.46s call     tests/test_misc.py::test_htlc_send_timeout
118.79s call     tests/test_closing.py::test_onchain_dust_out

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 .travis.yml           |  1 +
 tests/test_closing.py | 17 ++++++++++++++---
 tests/utils.py        |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1c77f2ab4..e1dcf13fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,7 @@ env:
 script:
   - docker pull cdecker/lightning-ci:${ARCH}bit | tee
   - env | grep -E '^[A-Z_]+\=' | tee /tmp/envlist
+  - echo SLOW_MACHINE=1 >> /tmp/envlist
   - docker run --rm=true --env-file=/tmp/envlist -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci:${ARCH}bit ./configure CC=${COMPILER:-gcc}
   - $SOURCE_CHECK_ONLY || docker run --rm=true --env-file=/tmp/envlist -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci:${ARCH}bit make -j3
   - $SOURCE_CHECK_ONLY || docker run --rm=true --env-file=/tmp/envlist -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci:${ARCH}bit make check
diff --git a/tests/test_closing.py b/tests/test_closing.py
index da229f265..165f0aa3f 100644
--- a/tests/test_closing.py
+++ b/tests/test_closing.py
@@ -1,6 +1,6 @@
 from fixtures import *  # noqa: F401,F403
 from lightning import RpcError
-from utils import only_one, sync_blockheight, wait_for, DEVELOPER, TIMEOUT, VALGRIND
+from utils import only_one, sync_blockheight, wait_for, DEVELOPER, TIMEOUT, VALGRIND, SLOW_MACHINE
 
 
 import queue
@@ -143,13 +143,21 @@ def test_closing_torture(node_factory, executor, bitcoind):
     l1, l2 = node_factory.get_nodes(2)
     amount = 10**6
 
-    # The range below of 15 is unsatisfactory.
     # Before the fix was applied, 15 would often pass.
     # However, increasing the number of tries would
     # take longer in VALGRIND mode, triggering a CI
     # failure since the test does not print any
     # output.
-    for i in range(15):
+    # On my laptop, VALGRIND is about 4x slower than native, hence
+    # the approximations below:
+
+    iterations = 50
+    if VALGRIND:
+        iterations //= 4
+    if SLOW_MACHINE:
+        iterations //= 2
+
+    for i in range(iterations):
         # Reduce probability that spurious sendrawtx error will occur
         l1.rpc.dev_rescan_outputs()
 
@@ -181,6 +189,7 @@ def test_closing_torture(node_factory, executor, bitcoind):
 
 
 @unittest.skipIf(not DEVELOPER, "needs dev-override-feerates")
+@unittest.skipIf(SLOW_MACHINE and VALGRIND, "slow test")
 def test_closing_different_fees(node_factory, bitcoind, executor):
     l1 = node_factory.get_node()
 
@@ -1094,6 +1103,7 @@ def setup_multihtlc_test(node_factory, bitcoind):
 
 
 @unittest.skipIf(not DEVELOPER, "needs DEVELOPER=1 for dev_ignore_htlcs")
+@unittest.skipIf(SLOW_MACHINE and VALGRIND, "slow test")
 def test_onchain_multihtlc_our_unilateral(node_factory, bitcoind):
     """Node pushes a channel onchain with multiple HTLCs with same payment_hash """
     h, nodes = setup_multihtlc_test(node_factory, bitcoind)
@@ -1181,6 +1191,7 @@ def test_onchain_multihtlc_our_unilateral(node_factory, bitcoind):
 
 
 @unittest.skipIf(not DEVELOPER, "needs DEVELOPER=1 for dev_ignore_htlcs")
+@unittest.skipIf(SLOW_MACHINE and VALGRIND, "slow test")
 def test_onchain_multihtlc_their_unilateral(node_factory, bitcoind):
     """Node pushes a channel onchain with multiple HTLCs with same payment_hash """
     h, nodes = setup_multihtlc_test(node_factory, bitcoind)
diff --git a/tests/utils.py b/tests/utils.py
index bfce2cc55..6c7567c2d 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -37,6 +37,7 @@ with open('config.vars') as configfile:
 DEVELOPER = os.getenv("DEVELOPER", config['DEVELOPER']) == "1"
 TIMEOUT = int(os.getenv("TIMEOUT", "60"))
 VALGRIND = os.getenv("VALGRIND", config['VALGRIND']) == "1"
+SLOW_MACHINE = os.getenv("SLOW_MACHINE", "0") == "1"
 
 
 def wait_for(success, timeout=TIMEOUT):