Merge cockroachdb#35089

35089: intentresolver: skip TestCleanupIntents r=knz a=tbg See cockroachdb#35085. (the PR is in flight, but this seems pretty flaky) Release note: None Co-authored-by: Tobias Schottdorf <[email protected]>
yuzefovich · Feb 20, 2019 · 1387b4f · 1387b4f
2 parents 4fbd5d1 + b4f8f0b
commit 1387b4f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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.