From 862c7ae223ca8ba2978eb63a6601c7e2006c6a2b Mon Sep 17 00:00:00 2001 From: "Johan T. Halseth" Date: Tue, 21 Aug 2018 12:21:14 +0200 Subject: [PATCH] contractcourt/channel_arbitrator test: check both respChan and errChan // Both are sent on, so in some cases we would read from errChan first, making the test fail. --- contractcourt/channel_arbitrator_test.go | 35 +++++++++++++++++++----- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/contractcourt/channel_arbitrator_test.go b/contractcourt/channel_arbitrator_test.go index f17482860..8d139aa3c 100644 --- a/contractcourt/channel_arbitrator_test.go +++ b/contractcourt/channel_arbitrator_test.go @@ -221,10 +221,17 @@ func TestChannelArbitratorLocalForceClose(t *testing.T) { select { case <-respChan: + case <-time.After(5 * time.Second): + t.Fatalf("no response received") + } + + select { case err := <-errChan: - t.Fatalf("error force closing channel: %v", err) - case <-time.After(15 * time.Second): - t.Fatalf("did not receive reponse") + if err != nil { + t.Fatalf("error force closing channel: %v", err) + } + case <-time.After(5 * time.Second): + t.Fatalf("no response received") } // After broadcasting the close tx, it should be in state @@ -308,9 +315,16 @@ func TestChannelArbitratorLocalForceCloseRemoteConfirmed(t *testing.T) { // Wait for a response to the force close. select { case <-respChan: + case <-time.After(5 * time.Second): + t.Fatalf("no response received") + } + + select { case err := <-errChan: - t.Fatalf("error force closing channel: %v", err) - case <-time.After(15 * time.Second): + if err != nil { + t.Fatalf("error force closing channel: %v", err) + } + case <-time.After(5 * time.Second): t.Fatalf("no response received") } @@ -396,9 +410,16 @@ func TestChannelArbitratorLocalForceDoubleSpend(t *testing.T) { // Wait for a response to the force close. select { case <-respChan: + case <-time.After(5 * time.Second): + t.Fatalf("no response received") + } + + select { case err := <-errChan: - t.Fatalf("error force closing channel: %v", err) - case <-time.After(15 * time.Second): + if err != nil { + t.Fatalf("error force closing channel: %v", err) + } + case <-time.After(5 * time.Second): t.Fatalf("no response received") }