aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-12-30 20:55:03 +0800
committerFelix Lange <fjl@twurst.com>2015-12-30 20:55:03 +0800
commit36137623edc18c086815b653b2eb0291579ffd22 (patch)
treeca2f1c568f72261aa93cfb549f04d33327df58b3
parentdbbcf558e2c4ccb4556ba62d07204c25ddcb4783 (diff)
parent1f39746886ce96436aec255347e19fc57edf74b5 (diff)
downloadgo-tangerine-36137623edc18c086815b653b2eb0291579ffd22.tar.gz
go-tangerine-36137623edc18c086815b653b2eb0291579ffd22.tar.zst
go-tangerine-36137623edc18c086815b653b2eb0291579ffd22.zip
Merge pull request #2099 from karalabe/fix-throttling-test
eth/downloader: throttling tests are time-sensitive, don't run parallel
-rw-r--r--eth/downloader/downloader_test.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go
index f02418a2f..347a0e3f0 100644
--- a/eth/downloader/downloader_test.go
+++ b/eth/downloader/downloader_test.go
@@ -720,8 +720,6 @@ func TestThrottling64Full(t *testing.T) { testThrottling(t, 64, FullSync) }
func TestThrottling64Fast(t *testing.T) { testThrottling(t, 64, FastSync) }
func testThrottling(t *testing.T, protocol int, mode SyncMode) {
- t.Parallel()
-
// Create a long block chain to download and the tester
targetBlocks := 8 * blockCacheLimit
hashes, headers, blocks, receipts := makeChain(targetBlocks, 0, genesis, nil)
@@ -751,7 +749,7 @@ func testThrottling(t *testing.T, protocol int, mode SyncMode) {
}
// Wait a bit for sync to throttle itself
var cached, frozen int
- for start := time.Now(); time.Since(start) < time.Second; {
+ for start := time.Now(); time.Since(start) < 3*time.Second; {
time.Sleep(25 * time.Millisecond)
tester.lock.Lock()