storage: deflake TestReplicateQueueRebalance

Temporarily disable the merge queue in this test. Fixes cockroachdb#28563 Release note: None
petermattis · Aug 28, 2018 · 04cfc87 · 04cfc87
1 parent 226085d
commit 04cfc87
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pkg/storage/replicate_queue_test.go b/pkg/storage/replicate_queue_test.go
@@ -52,6 +52,8 @@ func TestReplicateQueueRebalance(t *testing.T) {
 	for _, server := range tc.Servers {
 		st := server.ClusterSettings()
 		st.Manual.Store(true)
+		// TODO(benesch): Figure out why the merge queue causes this test to flake.
+		storage.MergeQueueEnabled.Override(&st.SV, false)
 		storage.EnableStatsBasedRebalancing.Override(&st.SV, false)
 	}