Merge #137829

137829: backup: skip TestDataDriven tests under deadlock r=jeffswenson a=msbutler

Fixes #137821
Fixes #137820
Fixes #137819
Fixes #137818
Fixes #137817
Fixes #137816
Fixes #137815

Release note: none

Co-authored-by: Michael Butler <[email protected]>

Author: craig[bot]

pkg/backup/backuptestutils/BUILD.bazel

@@ -14,7 +14,6 @@ go_library(
         "//pkg/kv/kvserver",
         "//pkg/sql/sqlstats",
         "//pkg/testutils",
-        "//pkg/testutils/skip",
         "//pkg/testutils/sqlutils",
         "//pkg/testutils/testcluster",
         "//pkg/util",

pkg/backup/backuptestutils/testutils.go

@@ -19,7 +19,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver"
 	"github.com/cockroachdb/cockroach/pkg/sql/sqlstats"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
-	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
 	"github.com/cockroachdb/cockroach/pkg/util"
@@ -102,11 +101,6 @@ func WithSkipInvalidDescriptorCheck() BackupTestArg {
 func StartBackupRestoreTestCluster(
 	t testing.TB, clusterSize int, args ...BackupTestArg,
 ) (*testcluster.TestCluster, *sqlutils.SQLRunner, string, func()) {
-
-	// Because the deadlock detector can increase the runtime of a test by 10-100x
-	// and has not found anything in recent memory for backup/restore tests.
-	skip.UnderDeadlock(t)
-
 	ctx := logtags.AddTag(context.Background(), "start-backup-restore-test-cluster", nil)
 	opts := backupTestOptions{}
 	for _, a := range args {