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

…-22.2-108446 release-22.2: kv: skip TestConstraintConformanceReportIntegration under deadlock
cockroachdb · Aug 11, 2023 · d28366e · d28366e
2 parents 245384a + ca73277
commit d28366e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pkg/kv/kvserver/reports/reporter_test.go b/pkg/kv/kvserver/reports/reporter_test.go
@@ -47,6 +47,8 @@ func TestConstraintConformanceReportIntegration(t *testing.T) {
 	// don't make progress.
 	skip.UnderStressRace(t)
 	skip.UnderRace(t, "takes >1min under race")
+	// Similarly, skip the test under deadlock builds.
+	skip.UnderDeadlock(t, "takes >1min under deadlock")
 
 	ctx := context.Background()
 	tc := serverutils.StartNewTestCluster(t, 5, base.TestClusterArgs{