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

…-24.1-122310 release-24.1: sql: skip TestParallel under deadlock (#123238) Co-Authored-By: Arul Ajmani <arulajmani@gmail.com>
cockroachdb · Apr 29, 2024 · 87e816d · 87e816d
2 parents d61dfc1 + 79faa9b
commit 87e816d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/pkg/sql/logictest/parallel_test.go b/pkg/sql/logictest/parallel_test.go
@@ -230,6 +230,7 @@ func TestParallel(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 
 	skip.UnderRace(t, "takes >1 min under race")
+	skip.UnderDeadlock(t, "too slow")
 
 	glob := *paralleltestdata
 	paths, err := filepath.Glob(glob)