kvserver: skip TestResetQuorum, TestLearnerSnapshotFailsRollback under short

On my machine the first takes 33s, the second 90s.

Release note: None

Author: andreimatei

pkg/kv/kvserver/replica_learner_test.go

@@ -309,6 +309,8 @@ func TestLearnerSnapshotFailsRollback(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderShort(t) // Takes 90s.
+
 	runTest := func(t *testing.T, replicaType roachpb.ReplicaType) {
 		var rejectSnapshots int64
 		knobs, ltk := makeReplicationTestKnobs()

pkg/kv/kvserver/reset_quorum_test.go

@@ -27,6 +27,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
+	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/errors"
 	"github.com/stretchr/testify/require"
 )
@@ -51,9 +52,11 @@ import (
 // 6. A meta range (error expected).
 func TestResetQuorum(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	defer log.Scope(t).Close(t)
 
 	skip.UnderStress(t, "too many nodes")
 	skip.UnderRace(t, "takes >1m under race")
+	skip.UnderShort(t)
 
 	ctx := context.Background()
 	livenessDuration := 3000 * time.Millisecond