Skip to content

Commit ee5e172

Browse files
committed
partitionccl: skip TestAlterPrimaryKeyCorrectZoneConfigBeforeBackfill under deadlock
Release note: None
1 parent 2b2511f commit ee5e172

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

pkg/ccl/partitionccl/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ go_test(
7777
"//pkg/sql/types",
7878
"//pkg/testutils",
7979
"//pkg/testutils/serverutils",
80+
"//pkg/testutils/skip",
8081
"//pkg/testutils/sqlutils",
8182
"//pkg/testutils/testcluster",
8283
"//pkg/util/encoding",

pkg/ccl/partitionccl/alter_primary_key_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"testing"
1010

1111
"github.com/cockroachdb/cockroach/pkg/ccl/testutilsccl"
12+
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
1213
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
1314
"github.com/cockroachdb/cockroach/pkg/util/log"
1415
)
@@ -17,6 +18,9 @@ func TestAlterPrimaryKeyCorrectZoneConfigBeforeBackfill(t *testing.T) {
1718
defer leaktest.AfterTest(t)()
1819
defer log.Scope(t).Close(t)
1920

21+
skip.UnderDeadlock(t)
22+
skip.UnderRace(t)
23+
2024
testCases := []testutilsccl.AlterPrimaryKeyCorrectZoneConfigTestCase{
2125
{
2226
Desc: "ALTER PRIMARY KEY",

0 commit comments

Comments
 (0)