Merge #61292 #61296

61292: ccl/streamingccl/streamingest: skip TestRandomClientGeneration r=RaduBerinde a=RaduBerinde Refs: #61287 Reason: flaky test Generated by bin/skip-test. Release justification: non-production code changes Release note: None 61296: kvserver: add a logscope r=andreimatei a=andreimatei Release note: None Release justification: Tests only. Co-authored-by: Radu Berinde <[email protected]> Co-authored-by: Andrei Matei <[email protected]>
cockroachdb · Mar 2, 2021 · 9129e7c · 9129e7c
3 parents 847e61c + b012577 + 6d2e6c2
commit 9129e7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/pkg/ccl/streamingccl/streamingest/stream_ingestion_processor_test.go b/pkg/ccl/streamingccl/streamingest/stream_ingestion_processor_test.go
@@ -31,6 +31,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/distsqlutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
@@ -275,6 +276,7 @@ func makeTestStreamURI(
 // stream workload.
 func TestRandomClientGeneration(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 61287, "flaky test")
 	defer log.Scope(t).Close(t)
 
 	ctx := context.Background()

diff --git a/pkg/kv/kvserver/client_replica_test.go b/pkg/kv/kvserver/client_replica_test.go
@@ -2295,6 +2295,7 @@ func TestRandomConcurrentAdminChangeReplicasRequests(t *testing.T) {
 
 func TestChangeReplicasSwapVoterWithNonVoter(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	defer log.Scope(t).Close(t)
 	skip.UnderRace(t)
 
 	const numNodes = 7