From 34a165dd12784aa0d26ccab3b9b63bae483015b5 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Thu, 2 Nov 2017 15:45:13 -0700 Subject: [PATCH] test: modify assertNumConnections to use a stoppable ticker --- lnd_test.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lnd_test.go b/lnd_test.go index dfde7d181..6bd2f108d 100644 --- a/lnd_test.go +++ b/lnd_test.go @@ -266,19 +266,18 @@ func assertNumOpenChannelsPending(ctxt context.Context, t *harnessTest, } } -//assertNumConnections asserts number current connections between two peers -func assertNumConnections( - ctxt context.Context, - t *harnessTest, - alice, bob *lightningNode, - expected int) { +// assertNumConnections asserts number current connections between two peers. +func assertNumConnections(ctxt context.Context, t *harnessTest, + alice, bob *lightningNode, expected int) { const nPolls = 10 - tick := time.Tick(300 * time.Millisecond) + tick := time.NewTicker(300 * time.Millisecond) + defer tick.Stop() + for i := nPolls - 1; i >= 0; i-- { select { - case <-tick: + case <-tick.C: aNumPeers, err := alice.ListPeers(ctxt, &lnrpc.ListPeersRequest{}) if err != nil { t.Fatalf("unable to fetch alice's node (%v) list peers %v",