Skip to content

Commit

Permalink
kv: don't disable the merge queue needlessly in more tests
Browse files Browse the repository at this point in the history
Follow up to #46383.

These tests were disabling the queue to not interfere with its
AdminSplits, but since the tests were written, AdminSplit got
a TTL.

Release note: None
Release justification: test only
  • Loading branch information
nvanbenschoten committed Mar 23, 2020
1 parent 00605e5 commit 623574d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 0 additions & 2 deletions pkg/kv/kvclient/kvcoord/dist_sender_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1312,8 +1312,6 @@ func TestPropagateTxnOnError(t *testing.T) {
}
return nil
}
// Don't clobber the test's splits.
storeKnobs.DisableMergeQueue = true

s, _, _ := serverutils.StartServer(t,
base.TestServerArgs{Knobs: base.TestingKnobs{Store: &storeKnobs}})
Expand Down
7 changes: 1 addition & 6 deletions pkg/kv/kvserver/client_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"testing"

"github.com/cockroachdb/cockroach/pkg/kv"
"github.com/cockroachdb/cockroach/pkg/kv/kvserver"
"github.com/cockroachdb/cockroach/pkg/roachpb"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
Expand All @@ -24,11 +23,7 @@ import (

func TestComputeStatsForKeySpan(t *testing.T) {
defer leaktest.AfterTest(t)()
storeCfg := kvserver.TestStoreConfig(nil /* clock */)
storeCfg.TestingKnobs.DisableMergeQueue = true
mtc := &multiTestContext{
storeConfig: &storeCfg,
}
mtc := &multiTestContext{}
defer mtc.Stop()
mtc.Start(t, 3)

Expand Down

0 comments on commit 623574d

Please sign in to comment.