From 621f1d458ed879da35bf6ce3b3389c587d330d51 Mon Sep 17 00:00:00 2001 From: Nathan VanBenschoten Date: Mon, 23 Mar 2020 18:11:05 -0400 Subject: [PATCH] kv: deflake TestRangeInfo by using a manual clock Fixes #46215. Fallout from https://github.com/cockroachdb/cockroach/pull/45984. Release justification: testing only Release note: None. --- pkg/kv/kvserver/client_replica_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/kv/kvserver/client_replica_test.go b/pkg/kv/kvserver/client_replica_test.go index ab4565b964b3..1408681aa1c2 100644 --- a/pkg/kv/kvserver/client_replica_test.go +++ b/pkg/kv/kvserver/client_replica_test.go @@ -1454,6 +1454,7 @@ func TestRangeInfo(t *testing.T) { defer leaktest.AfterTest(t)() storeCfg := kvserver.TestStoreConfig(nil /* clock */) storeCfg.TestingKnobs.DisableMergeQueue = true + storeCfg.Clock = nil // manual clock mtc := &multiTestContext{ storeConfig: &storeCfg, // This test was written before the multiTestContext started creating many