From 5b1cfdef898e3ce1b2e063fba23f04c9f7d1008d Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Wed, 8 Jul 2020 11:50:26 +0200 Subject: [PATCH] eth: increase timeout in TestBroadcastBlock (#21299) --- eth/handler_test.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/eth/handler_test.go b/eth/handler_test.go index 142630857..fc6c6f274 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -614,13 +614,16 @@ func testBroadcastBlock(t *testing.T, totalPeers, broadcastExpected int) { select { case <-doneCh: received++ - - case <-time.After(time.Second): + if received > broadcastExpected { + // We can bail early here + t.Errorf("broadcast count mismatch: have %d > want %d", received, broadcastExpected) + return + } + case <-time.After(2 * time.Second): if received != broadcastExpected { t.Errorf("broadcast count mismatch: have %d, want %d", received, broadcastExpected) } return - case err = <-errCh: t.Fatalf("broadcast failed: %v", err) }