Merge pull request #127398 from cockroachdb/blathers/backport-release…

…-23.1-127366

release-23.1: kv: deflake TestStoreRangeMergeWithData

pkg/kv/kvserver/client_merge_test.go

@@ -270,6 +270,10 @@ func TestStoreRangeMergeWithData(t *testing.T) {
 func mergeWithData(t *testing.T, retries int64) {
 	ctx := context.Background()
 
+	// Set a long txn liveness threshold so that the merge txn cannot be aborted,
+	// even when we manually advance the clock to trigger a lease acquisition.
+	defer txnwait.TestingOverrideTxnLivenessThreshold(time.Hour)()
+
 	manualClock := hlc.NewHybridManualClock()
 	var store *kvserver.Store
 	// Maybe inject some retryable errors when the merge transaction commits.