Merge #64090 #64091

64090: kv/kvserver: skip TestTxnClearRangeIntents under race r=sumeerbhola a=sumeerbhola Refs: #64088 Reason: flaky test Generated by bin/skip-test. Release justification: non-production code changes Release note: None 64091: kv/kvserver: skip TestMergeQueue r=sumeerbhola a=sumeerbhola Refs: #64056 Reason: flaky test Generated by bin/skip-test. Release justification: non-production code changes Release note: None Co-authored-by: sumeerbhola <[email protected]>
cockroachdb · Apr 22, 2021 · b4766e0 · b4766e0
3 parents ea6dc01 + 4d3cf8b + 0f7317c
commit b4766e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/pkg/kv/kvserver/client_merge_test.go b/pkg/kv/kvserver/client_merge_test.go
@@ -4073,6 +4073,7 @@ func verifyUnmerged(t *testing.T, store *kvserver.Store, lhsStartKey, rhsStartKe
 
 func TestMergeQueue(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 64056, "flaky test")
 	defer log.Scope(t).Close(t)
 
 	ctx := context.Background()

diff --git a/pkg/kv/kvserver/txn_recovery_integration_test.go b/pkg/kv/kvserver/txn_recovery_integration_test.go
@@ -20,6 +20,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/kv"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -339,6 +340,7 @@ func TestTxnRecoveryFromStagingWithHighPriority(t *testing.T) {
 // are disabled. See also: https://github.com/cockroachdb/cockroach/issues/46764
 func TestTxnClearRangeIntents(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	skip.UnderRaceWithIssue(t, 64088, "flaky test")
 	defer log.Scope(t).Close(t)
 
 	ctx := context.Background()