Merge #98405

98405: kv: skip TestStoreResolveMetrics TestReplicaRemovalClosesProposalQuota r=999 a=msbutler Informs #98404 Epic: none Release note: none Co-authored-by: Michael Butler <[email protected]>
cockroachdb · Mar 10, 2023 · 3ae29f4 · 3ae29f4
2 parents 1a58583 + 4a38607
commit 3ae29f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/pkg/kv/kvserver/client_metrics_test.go b/pkg/kv/kvserver/client_metrics_test.go
@@ -29,6 +29,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
+	"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"
@@ -178,6 +179,8 @@ func TestStoreResolveMetrics(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.WithIssue(t, 98404)
+
 	// First prevent rot that would result from adding fields without handling
 	// them everywhere.
 	{

diff --git a/pkg/kv/kvserver/client_raft_test.go b/pkg/kv/kvserver/client_raft_test.go
@@ -5573,6 +5573,7 @@ func TestReplicaRemovalClosesProposalQuota(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 	ctx := context.Background()
+	skip.WithIssue(t, 98412)
 	// These variables track the request count to make sure that all of the
 	// requests have made it to the Replica.
 	var (