aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-08-07 19:09:35 +0800
committerGitHub <noreply@github.com>2017-08-07 19:09:35 +0800
commitf7848c2aa509ff4ac7c0f84e33bdb66b8fe3e80a (patch)
treeeae2198ba1ac432a94e2d7ccfefe0e29670c435f
parentb159cdd8dd33ba030e7af5aa144de43441e4f543 (diff)
parent5b742fb82b31298f384c2ee7fb76fb1fa3a3f6e9 (diff)
downloaddexon-f7848c2aa509ff4ac7c0f84e33bdb66b8fe3e80a.tar
dexon-f7848c2aa509ff4ac7c0f84e33bdb66b8fe3e80a.tar.gz
dexon-f7848c2aa509ff4ac7c0f84e33bdb66b8fe3e80a.tar.bz2
dexon-f7848c2aa509ff4ac7c0f84e33bdb66b8fe3e80a.tar.lz
dexon-f7848c2aa509ff4ac7c0f84e33bdb66b8fe3e80a.tar.xz
dexon-f7848c2aa509ff4ac7c0f84e33bdb66b8fe3e80a.tar.zst
dexon-f7848c2aa509ff4ac7c0f84e33bdb66b8fe3e80a.zip
Merge pull request #14911 from karalabe/txpool-flaky-test
core: bump timeout test to avoid flakyness on overloaded ci
-rw-r--r--core/tx_pool_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go
index 80bc0b384..9a03caf61 100644
--- a/core/tx_pool_test.go
+++ b/core/tx_pool_test.go
@@ -750,14 +750,14 @@ func TestTransactionQueueTimeLimitingNoLocals(t *testing.T) { testTransactionQue
func testTransactionQueueTimeLimiting(t *testing.T, nolocals bool) {
// Reduce the eviction interval to a testable amount
defer func(old time.Duration) { evictionInterval = old }(evictionInterval)
- evictionInterval = 250 * time.Millisecond
+ evictionInterval = time.Second
// Create the pool to test the non-expiration enforcement
db, _ := ethdb.NewMemDatabase()
statedb, _ := state.New(common.Hash{}, state.NewDatabase(db))
config := testTxPoolConfig
- config.Lifetime = 250 * time.Millisecond
+ config.Lifetime = time.Second
config.NoLocals = nolocals
pool := NewTxPool(config, params.TestChainConfig, new(event.TypeMux), func() (*state.StateDB, error) { return statedb, nil }, func() *big.Int { return big.NewInt(1000000) })