Skip to content

Commit fdf5a12

Browse files
committed
Revert "backup: skip running tests under deadlock when they begin a test cluster"
This reverts commit 6f1076b.
1 parent 6eb6d49 commit fdf5a12

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

pkg/backup/backuptestutils/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ go_library(
1414
"//pkg/kv/kvserver",
1515
"//pkg/sql/sqlstats",
1616
"//pkg/testutils",
17-
"//pkg/testutils/skip",
1817
"//pkg/testutils/sqlutils",
1918
"//pkg/testutils/testcluster",
2019
"//pkg/util",

pkg/backup/backuptestutils/testutils.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"github.com/cockroachdb/cockroach/pkg/kv/kvserver"
2020
"github.com/cockroachdb/cockroach/pkg/sql/sqlstats"
2121
"github.com/cockroachdb/cockroach/pkg/testutils"
22-
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
2322
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
2423
"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
2524
"github.com/cockroachdb/cockroach/pkg/util"
@@ -102,11 +101,6 @@ func WithSkipInvalidDescriptorCheck() BackupTestArg {
102101
func StartBackupRestoreTestCluster(
103102
t testing.TB, clusterSize int, args ...BackupTestArg,
104103
) (*testcluster.TestCluster, *sqlutils.SQLRunner, string, func()) {
105-
106-
// Because the deadlock detector can increase the runtime of a test by 10-100x
107-
// and has not found anything in recent memory for backup/restore tests.
108-
skip.UnderDeadlock(t)
109-
110104
ctx := logtags.AddTag(context.Background(), "start-backup-restore-test-cluster", nil)
111105
opts := backupTestOptions{}
112106
for _, a := range args {

0 commit comments

Comments
 (0)