diff options
author | Martin Holst Swende <martin@swende.se> | 2019-01-23 23:09:29 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-23 23:09:29 +0800 |
commit | dc43ea8d0394d9336ea7a3e2a920f3b55bb3189d (patch) | |
tree | 91fe94dd3d1131a718ad3ef579d1a5d43348ede1 | |
parent | a50b471b6b9c54eba795b74f6d74a09d531af9dc (diff) | |
download | go-tangerine-dc43ea8d0394d9336ea7a3e2a920f3b55bb3189d.tar go-tangerine-dc43ea8d0394d9336ea7a3e2a920f3b55bb3189d.tar.gz go-tangerine-dc43ea8d0394d9336ea7a3e2a920f3b55bb3189d.tar.bz2 go-tangerine-dc43ea8d0394d9336ea7a3e2a920f3b55bb3189d.tar.lz go-tangerine-dc43ea8d0394d9336ea7a3e2a920f3b55bb3189d.tar.xz go-tangerine-dc43ea8d0394d9336ea7a3e2a920f3b55bb3189d.tar.zst go-tangerine-dc43ea8d0394d9336ea7a3e2a920f3b55bb3189d.zip |
tests: tune flaky tests that error in travis occasionally (#18508)
* tests: tune flaky tests that error in travis occasionally
* tests: formatting
-rw-r--r-- | eth/fetcher/fetcher_test.go | 2 | ||||
-rw-r--r-- | miner/worker_test.go | 2 | ||||
-rw-r--r-- | p2p/protocols/protocol_test.go | 7 | ||||
-rw-r--r-- | p2p/protocols/reporter_test.go | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 3d4f0d1e5..a86e773e3 100644 --- a/eth/fetcher/fetcher_test.go +++ b/eth/fetcher/fetcher_test.go @@ -244,7 +244,7 @@ func verifyImportEvent(t *testing.T, imported chan *types.Block, arrive bool) { select { case <-imported: t.Fatalf("import invoked") - case <-time.After(10 * time.Millisecond): + case <-time.After(20 * time.Millisecond): } } } diff --git a/miner/worker_test.go b/miner/worker_test.go index 7c8f167a1..bfa9cbd21 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -224,7 +224,7 @@ func testEmptyWork(t *testing.T, chainConfig *params.ChainConfig, engine consens for i := 0; i < 2; i += 1 { select { case <-taskCh: - case <-time.NewTimer(time.Second).C: + case <-time.NewTimer(2 * time.Second).C: t.Error("new task timeout") } } diff --git a/p2p/protocols/protocol_test.go b/p2p/protocols/protocol_test.go index a26222cd8..41845d747 100644 --- a/p2p/protocols/protocol_test.go +++ b/p2p/protocols/protocol_test.go @@ -269,8 +269,11 @@ func TestProtocolHook(t *testing.T) { if !testHook.send { t.Fatal("Expected a send message, but it is not") } - if testHook.peer == nil || testHook.peer.ID() != tester.Nodes[0].ID() { - t.Fatal("Expected peer ID to be set correctly, but it is not") + if testHook.peer == nil { + t.Fatal("Expected peer to be set, is nil") + } + if peerId := testHook.peer.ID(); peerId != tester.Nodes[0].ID() && peerId != tester.Nodes[1].ID() { + t.Fatalf("Expected peer ID to be set correctly, but it is not (got %v, exp %v or %v", peerId, tester.Nodes[0].ID(), tester.Nodes[1].ID()) } if testHook.size != 11 { //11 is the length of the encoded message t.Fatalf("Expected size to be %d, but it is %d ", 1, testHook.size) diff --git a/p2p/protocols/reporter_test.go b/p2p/protocols/reporter_test.go index b9f06e674..8f27d07e8 100644 --- a/p2p/protocols/reporter_test.go +++ b/p2p/protocols/reporter_test.go @@ -39,7 +39,7 @@ func TestReporter(t *testing.T) { //setup the metrics log.Debug("Setting up metrics first time") - reportInterval := 5 * time.Millisecond + reportInterval := 2 * time.Millisecond metrics := SetupAccountingMetrics(reportInterval, filepath.Join(dir, "test.db")) log.Debug("Done.") |