Merge #105897

105897: kvserver: deflake TestClosedTimestampCantServeWithConflictingIntent r=erikgrinaker a=erikgrinaker

Resolves #101824.
Epic: none
Release note: None

Co-authored-by: Erik Grinaker <grinaker@cockroachlabs.com>

pkg/kv/kvserver/closed_timestamp_test.go

@@ -58,6 +58,11 @@ import (
 
 var aggressiveResolvedTimestampClusterArgs = base.TestClusterArgs{
 	ServerArgs: base.TestServerArgs{
+		RaftConfig: base.RaftConfig{
+			// With expiration-based leases, we may be unable to maintain leases under
+			// race and stress, so use a longer lease duration.
+			RangeLeaseDuration: time.Minute,
+		},
 		Knobs: base.TestingKnobs{
 			Store: aggressiveResolvedTimestampPushKnobs(),
 		},