diff --git a/pkg/ccl/backupccl/BUILD.bazel b/pkg/ccl/backupccl/BUILD.bazel index ead29afdf9a4..02ab85b2124f 100644 --- a/pkg/ccl/backupccl/BUILD.bazel +++ b/pkg/ccl/backupccl/BUILD.bazel @@ -242,7 +242,6 @@ go_test( "//pkg/sql/catalog/descpb", "//pkg/sql/catalog/descs", "//pkg/sql/catalog/desctestutils", - "//pkg/sql/catalog/lease", "//pkg/sql/catalog/systemschema", "//pkg/sql/catalog/tabledesc", "//pkg/sql/execinfra", diff --git a/pkg/ccl/backupccl/backup_cloud_test.go b/pkg/ccl/backupccl/backup_cloud_test.go index c48c38cdf48d..fea4b2b69869 100644 --- a/pkg/ccl/backupccl/backup_cloud_test.go +++ b/pkg/ccl/backupccl/backup_cloud_test.go @@ -19,7 +19,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/cloud" "github.com/cockroachdb/cockroach/pkg/cloud/amazon" "github.com/cockroachdb/cockroach/pkg/cloud/azure" - "github.com/cockroachdb/cockroach/pkg/sql/catalog/lease" "github.com/cockroachdb/cockroach/pkg/testutils/skip" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/testutils/testcluster" @@ -51,8 +50,6 @@ func TestCloudBackupRestoreS3(t *testing.T) { defer log.Scope(t).Close(t) creds, bucket := requiredS3CredsAndBucket(t) - // TODO(dan): Actually invalidate the descriptor cache and delete this line. - defer lease.TestingDisableTableLeases()() const numAccounts = 1000 ctx := context.Background() @@ -70,8 +67,6 @@ func TestCloudBackupRestoreS3WithLegacyPut(t *testing.T) { defer log.Scope(t).Close(t) creds, bucket := requiredS3CredsAndBucket(t) - // TODO(dan): Actually invalidate the descriptor cache and delete this line. - defer lease.TestingDisableTableLeases()() const numAccounts = 1000 ctx := context.Background() @@ -131,8 +126,6 @@ func TestCloudBackupRestoreGoogleCloudStorage(t *testing.T) { skip.IgnoreLint(t, "GOOGLE_BUCKET env var must be set") } - // TODO(dan): Actually invalidate the descriptor cache and delete this line. - defer lease.TestingDisableTableLeases()() const numAccounts = 1000 ctx := context.Background() @@ -164,8 +157,6 @@ func TestCloudBackupRestoreAzure(t *testing.T) { skip.IgnoreLint(t, "AZURE_CONTAINER env var must be set") } - // TODO(dan): Actually invalidate the descriptor cache and delete this line. - defer lease.TestingDisableTableLeases()() const numAccounts = 1000 ctx := context.Background()