Merge pull request #2099 from karalabe/fix-throttling-test

eth/downloader: throttling tests are time-sensitive, don't run parallel
This commit is contained in:
Felix Lange 2015-12-30 13:55:03 +01:00
commit 36137623ed

View File

@ -720,8 +720,6 @@ func TestThrottling64Full(t *testing.T) { testThrottling(t, 64, FullSync) }
func TestThrottling64Fast(t *testing.T) { testThrottling(t, 64, FastSync) } func TestThrottling64Fast(t *testing.T) { testThrottling(t, 64, FastSync) }
func testThrottling(t *testing.T, protocol int, mode SyncMode) { func testThrottling(t *testing.T, protocol int, mode SyncMode) {
t.Parallel()
// Create a long block chain to download and the tester // Create a long block chain to download and the tester
targetBlocks := 8 * blockCacheLimit targetBlocks := 8 * blockCacheLimit
hashes, headers, blocks, receipts := makeChain(targetBlocks, 0, genesis, nil) 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 // Wait a bit for sync to throttle itself
var cached, frozen int 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) time.Sleep(25 * time.Millisecond)
tester.lock.Lock() tester.lock.Lock()