From 3993a69bec26a17183e2540a626655b102e567cf Mon Sep 17 00:00:00 2001 From: irfan sharif Date: Wed, 30 Jun 2021 14:13:57 -0400 Subject: [PATCH] ccl,kv: skip a few flakey tests/sub-tests Relevant test failure issues: #66991, #67034, #66942, #66480, #64313. Release note: None --- pkg/ccl/changefeedccl/changefeed_test.go | 10 ++++++++-- pkg/kv/kvserver/client_merge_test.go | 1 + pkg/kv/kvserver/client_split_test.go | 1 + pkg/kv/kvserver/replica_test.go | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkg/ccl/changefeedccl/changefeed_test.go b/pkg/ccl/changefeedccl/changefeed_test.go index a7d6007ca321..a28ac82941a1 100644 --- a/pkg/ccl/changefeedccl/changefeed_test.go +++ b/pkg/ccl/changefeedccl/changefeed_test.go @@ -2332,7 +2332,10 @@ func TestChangefeedSchemaTTL(t *testing.T) { t.Run("enterprise", enterpriseTest(testFn)) t.Run("cloudstorage", cloudStorageTest(testFn)) t.Run("kafka", kafkaTest(testFn)) - t.Run(`webhook`, webhookTest(testFn)) + t.Run(`webhook`, func(t *testing.T) { + skip.WithIssue(t, 66991, "flaky test") + webhookTest(testFn)(t) + }) } func TestChangefeedErrors(t *testing.T) { @@ -3221,7 +3224,10 @@ func TestManyChangefeedsOneTable(t *testing.T) { t.Run(`enterprise`, enterpriseTest(testFn)) t.Run(`cloudstorage`, cloudStorageTest(testFn)) t.Run(`kafka`, kafkaTest(testFn)) - t.Run(`webhook`, webhookTest(testFn)) + t.Run(`webhook`, func(t *testing.T) { + skip.WithIssue(t, 67034, "flakey test") + webhookTest(testFn)(t) + }) } func TestUnspecifiedPrimaryKey(t *testing.T) { diff --git a/pkg/kv/kvserver/client_merge_test.go b/pkg/kv/kvserver/client_merge_test.go index b68d6b90e518..9cb4f47acbdc 100644 --- a/pkg/kv/kvserver/client_merge_test.go +++ b/pkg/kv/kvserver/client_merge_test.go @@ -4378,6 +4378,7 @@ func TestMergeQueue(t *testing.T) { }) t.Run("sticky-bit-expiration", func(t *testing.T) { + skip.WithIssue(t, 66942, "flakey test") manualSplitTTL := time.Millisecond * 200 reset(t) store.MustForceMergeScanAndProcess() diff --git a/pkg/kv/kvserver/client_split_test.go b/pkg/kv/kvserver/client_split_test.go index 332719247a74..2da7cd77b743 100644 --- a/pkg/kv/kvserver/client_split_test.go +++ b/pkg/kv/kvserver/client_split_test.go @@ -2010,6 +2010,7 @@ func TestStoreSplitGCThreshold(t *testing.T) { // and the uninitialized replica reacting to messages. func TestStoreRangeSplitRaceUninitializedRHS(t *testing.T) { defer leaktest.AfterTest(t)() + skip.WithIssue(t, 66480, "flaky test") defer log.Scope(t).Close(t) currentTrigger := make(chan *roachpb.SplitTrigger, 1) diff --git a/pkg/kv/kvserver/replica_test.go b/pkg/kv/kvserver/replica_test.go index afb54236fbd1..87c6dfa87164 100644 --- a/pkg/kv/kvserver/replica_test.go +++ b/pkg/kv/kvserver/replica_test.go @@ -5606,6 +5606,7 @@ func TestPushTxnAlreadyCommittedOrAborted(t *testing.T) { // test cases, the priorities are set such that the push will succeed. func TestPushTxnUpgradeExistingTxn(t *testing.T) { defer leaktest.AfterTest(t)() + skip.WithIssue(t, 64313, "flaky test") defer log.Scope(t).Close(t) tc := testContext{} stopper := stop.NewStopper()