From b4f8f0b64310ff7b03c3f5f29c867d5d6b772bf3 Mon Sep 17 00:00:00 2001
From: Tobias Schottdorf <tobias.schottdorf@gmail.com>
Date: Wed, 20 Feb 2019 11:05:21 +0100
Subject: [PATCH] intentresolver: skip TestCleanupIntents

See https://github.com/cockroachdb/cockroach/pull/35085.

Release note: None
---
 pkg/storage/intentresolver/intent_resolver_test.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/storage/intentresolver/intent_resolver_test.go b/pkg/storage/intentresolver/intent_resolver_test.go
index 4a414e7cbc3b..2b690248242e 100644
--- a/pkg/storage/intentresolver/intent_resolver_test.go
+++ b/pkg/storage/intentresolver/intent_resolver_test.go
@@ -630,6 +630,9 @@ func counterSendFunc(counter *int64, f sendFunc) sendFunc {
 // and returns the appropriate errors.
 func TestCleanupIntents(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+
+	t.Skip("https://github.com/cockroachdb/cockroach/pull/35085")
+
 	clock := hlc.NewClock(hlc.UnixNano, time.Nanosecond)
 	txn := beginTransaction(t, clock, roachpb.MinUserPriority, roachpb.Key("a"), true)
 	// Set txn.ID to a very small value so it's sorted deterministically first.