Merge pull request #16399 from irfansharif/TestRaftRemoveRace-flakiness

storage: deflake TestRaftRemoveRace
cockroachdb · Jun 8, 2017 · 5bef6b6 · 5bef6b6
2 parents 9ca34ef + eace0dd
commit 5bef6b6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/storage/client_raft_test.go b/pkg/storage/client_raft_test.go
@@ -2115,7 +2115,11 @@ func TestRaftAfterRemoveRange(t *testing.T) {
 // reproduce a race (see #1911 and #9037).
 func TestRaftRemoveRace(t *testing.T) {
 	defer leaktest.AfterTest(t)()
-	mtc := &multiTestContext{}
+	sc := storage.TestStoreConfig(nil)
+	// Suppress timeout-based elections to avoid leadership changes in ways
+	// this test doesn't expect.
+	sc.RaftElectionTimeoutTicks = 100000
+	mtc := &multiTestContext{storeConfig: &sc}
 	defer mtc.Stop()
 	mtc.Start(t, 10)