From b74b9fc16ebe57424d2a75d205f7cc3507ae10d8 Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Fri, 22 Dec 2017 19:29:12 +0100
Subject: [PATCH] test: extend time outs in flaky tests due to Travis CI
 instance speed variance

---
 fundingmanager_test.go  | 8 ++++----
 htlcswitch/link_test.go | 2 +-
 lnd_test.go             | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/fundingmanager_test.go b/fundingmanager_test.go
index 3da5fcbb..02698fef 100644
--- a/fundingmanager_test.go
+++ b/fundingmanager_test.go
@@ -775,13 +775,13 @@ func assertHandleFundingLocked(t *testing.T, alice, bob *testNode) {
 	// They should both send the new channel to the breach arbiter.
 	select {
 	case <-alice.arbiterChan:
-	case <-time.After(time.Second * 5):
+	case <-time.After(time.Second * 15):
 		t.Fatalf("alice did not send channel to breach arbiter")
 	}
 
 	select {
 	case <-bob.arbiterChan:
-	case <-time.After(time.Second * 5):
+	case <-time.After(time.Second * 15):
 		t.Fatalf("bob did not send channel to breach arbiter")
 	}
 
@@ -789,14 +789,14 @@ func assertHandleFundingLocked(t *testing.T, alice, bob *testNode) {
 	select {
 	case c := <-alice.peer.newChannels:
 		close(c.done)
-	case <-time.After(time.Second * 5):
+	case <-time.After(time.Second * 15):
 		t.Fatalf("alice did not send new channel to peer")
 	}
 
 	select {
 	case c := <-bob.peer.newChannels:
 		close(c.done)
-	case <-time.After(time.Second * 5):
+	case <-time.After(time.Second * 15):
 		t.Fatalf("bob did not send new channel to peer")
 	}
 }
diff --git a/htlcswitch/link_test.go b/htlcswitch/link_test.go
index 6d41e308..ef91da6b 100644
--- a/htlcswitch/link_test.go
+++ b/htlcswitch/link_test.go
@@ -2242,7 +2242,7 @@ func TestChannelLinkUpdateCommitFee(t *testing.T) {
 			"network fee")
 	}
 
-	time.Sleep(time.Second * 1)
+	time.Sleep(time.Second * 2)
 
 	// At this point, Alice should've triggered a new fee update that
 	// increased the fee rate to match the new rate.
diff --git a/lnd_test.go b/lnd_test.go
index fc1fed99..fbccae31 100644
--- a/lnd_test.go
+++ b/lnd_test.go
@@ -1605,7 +1605,7 @@ func testChannelForceClosure(net *lntest.NetworkHarness, t *harnessTest) {
 	}
 
 	// Wait for the single sweep txn to appear in the mempool.
-	htlcSweepTxID, err := waitForTxInMempool(net.Miner.Node, 3*time.Second)
+	htlcSweepTxID, err := waitForTxInMempool(net.Miner.Node, 15*time.Second)
 	if err != nil {
 		t.Fatalf("failed to get sweep tx from mempool: %v", err)
 	}
@@ -1984,7 +1984,7 @@ func testListPayments(net *lntest.NetworkHarness, t *harnessTest) {
 func testMultiHopPayments(net *lntest.NetworkHarness, t *harnessTest) {
 	const chanAmt = btcutil.Amount(100000)
 	ctxb := context.Background()
-	timeout := time.Duration(time.Second * 5)
+	timeout := time.Duration(time.Second * 15)
 	var networkChans []*lnrpc.ChannelPoint
 
 	// Open a channel with 100k satoshis between Alice and Bob with Alice
@@ -3313,7 +3313,7 @@ func testHtlcErrorPropagation(net *lntest.NetworkHarness, t *harnessTest) {
 	// In this test we wish to exercise the daemon's correct parsing,
 	// handling, and propagation of errors that occur while processing a
 	// multi-hop payment.
-	timeout := time.Duration(time.Second * 5)
+	timeout := time.Duration(time.Second * 15)
 	ctxb := context.Background()
 
 	const chanAmt = maxFundingAmount
@@ -3897,7 +3897,7 @@ func testNodeAnnouncement(net *lntest.NetworkHarness, t *harnessTest) {
 }
 
 func testNodeSignVerify(net *lntest.NetworkHarness, t *harnessTest) {
-	timeout := time.Duration(time.Second * 5)
+	timeout := time.Duration(time.Second * 15)
 	ctxb := context.Background()
 
 	chanAmt := maxFundingAmount