Merge cockroachdb#116083

116083: application_api,lease: skip some tests under `deadlock` r=rail a=rickystewart These tests are all likely to time out. Epic: CRDB-8308 Release note: None Co-authored-by: Ricky Stewart <[email protected]>
jayshrivastava · Dec 11, 2023 · 55302da · 55302da
2 parents c908c4f + f9b20ae
commit 55302da
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/pkg/server/application_api/schema_inspection_test.go b/pkg/server/application_api/schema_inspection_test.go
@@ -480,6 +480,8 @@ func TestAdminAPITableStats(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderDeadlockWithIssue(t, 115914, "likely to time out")
+
 	skip.UnderStress(t, "flaky under stress #107156")
 	skip.UnderRace(t, "flaky under race #107156")
 

diff --git a/pkg/server/application_api/stats_test.go b/pkg/server/application_api/stats_test.go
@@ -30,6 +30,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/diagutils"
 	"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/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -41,6 +42,8 @@ func TestTelemetrySQLStatsIndependence(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderDeadlockWithIssue(t, 115914, "likely to time out")
+
 	ctx := context.Background()
 	var params base.TestServerArgs
 	params.Knobs.SQLStatsKnobs = sqlstats.CreateTestingKnobs()

diff --git a/pkg/server/application_api/stmtdiag_test.go b/pkg/server/application_api/stmtdiag_test.go
@@ -24,6 +24,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/sessiondata"
 	"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/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -231,6 +232,8 @@ func TestStatementDiagnosticsDoesNotReturnExpiredRequests(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderDeadlockWithIssue(t, 115914, "likely to time out")
+
 	s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{})
 	defer s.Stopper().Stop(context.Background())
 	db := sqlutils.MakeSQLRunner(sqlDB)

diff --git a/pkg/sql/catalog/lease/lease_test.go b/pkg/sql/catalog/lease/lease_test.go
@@ -1828,6 +1828,8 @@ func TestLeaseRenewedPeriodically(testingT *testing.T) {
 	defer leaktest.AfterTest(testingT)()
 	defer log.Scope(testingT).Close(testingT)
 
+	skip.UnderDeadlockWithIssue(testingT, 115910, "likely to time out")
+
 	ctx := context.Background()
 
 	var mu syncutil.Mutex