Merge pull request #116248 from cockroachdb/blathers/backport-release…

…-23.2-116125 release-23.2: sql: skip a couple of tests under deadlock (#116248) Co-Authored-By: Yahor Yuzefovich <[email protected]>
cockroachdb · Dec 12, 2023 · 3e2cbad · 3e2cbad
2 parents eda5279 + dbcaee8
commit 3e2cbad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/pkg/ccl/testccl/sqlccl/BUILD.bazel b/pkg/ccl/testccl/sqlccl/BUILD.bazel
@@ -46,6 +46,7 @@ go_test(
         "//pkg/sql/tests",
         "//pkg/testutils",
         "//pkg/testutils/serverutils",
+        "//pkg/testutils/skip",
         "//pkg/testutils/sqlutils",
         "//pkg/testutils/testcluster",
         "//pkg/util/hlc",

diff --git a/pkg/ccl/testccl/sqlccl/explain_test.go b/pkg/ccl/testccl/sqlccl/explain_test.go
@@ -19,6 +19,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/lexbase"
 	"github.com/cockroachdb/cockroach/pkg/sql/tests"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/randutil"
@@ -33,6 +34,8 @@ func TestExplainRedactDDL(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderDeadlock(t, "the test is too slow")
+
 	const numStatements = 10
 
 	ctx := context.Background()

diff --git a/pkg/sql/explain_test.go b/pkg/sql/explain_test.go
@@ -509,6 +509,8 @@ func TestExplainRedact(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderDeadlock(t, "the test is too slow")
+
 	const numStatements = 10
 
 	ctx := context.Background()