Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sqlccl: remove base.TODOTestTenantDisabled #108721

Merged
merged 1 commit into from
Aug 14, 2023
Merged

sqlccl: remove base.TODOTestTenantDisabled #108721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/ccl/testccl/sqlccl/gc_job_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
"github.com/cockroachdb/cockroach/pkg/util/log"
"github.com/cockroachdb/errors"
)

Expand All @@ -28,8 +29,9 @@ import (
// registry.
func TestGCJobGetsMarkedIdle(t *testing.T) {
defer leaktest.AfterTest(t)()
ctx := context.Background()
defer log.Scope(t).Close(t)

ctx := context.Background()
s, mainDB, _ := serverutils.StartServer(t, base.TestServerArgs{
DefaultTestTenant: base.TestControlsTenantsExplicitly,
})
Expand Down
3 changes: 1 addition & 2 deletions pkg/ccl/testccl/sqlccl/run_control_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ func makeRunControlTestCases(t *testing.T) ([]runControlTestCase, func()) {
tc := serverutils.StartNewTestCluster(
t, 2 /* numNodes */, base.TestClusterArgs{
ServerArgs: base.TestServerArgs{
// Disable the implicit default test tenant so that we can start our own.
DefaultTestTenant: base.TODOTestTenantDisabled,
DefaultTestTenant: base.TestControlsTenantsExplicitly,
},
ReplicationMode: base.ReplicationManual,
},
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/testccl/sqlccl/session_revival_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
"github.com/cockroachdb/cockroach/pkg/util/log"
"github.com/cockroachdb/cockroach/pkg/util/protoutil"
"github.com/cockroachdb/cockroach/pkg/util/timeutil"
pbtypes "github.com/gogo/protobuf/types"
Expand All @@ -32,8 +33,9 @@ import (

func TestAuthenticateWithSessionRevivalToken(t *testing.T) {
defer leaktest.AfterTest(t)()
ctx := context.Background()
defer log.Scope(t).Close(t)

ctx := context.Background()
s, mainDB, _ := serverutils.StartServer(t, base.TestServerArgs{
DefaultTestTenant: base.TestControlsTenantsExplicitly,
})
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/testccl/sqlccl/show_transfer_state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@ import (
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
"github.com/cockroachdb/cockroach/pkg/util/log"
"github.com/jackc/pgx/v5"
"github.com/stretchr/testify/require"
)

func TestShowTransferState(t *testing.T) {
defer leaktest.AfterTest(t)()
ctx := context.Background()
defer log.Scope(t).Close(t)

ctx := context.Background()
s, mainDB, _ := serverutils.StartServer(t, base.TestServerArgs{
DefaultTestTenant: base.TestControlsTenantsExplicitly,
})
Expand Down
5 changes: 3 additions & 2 deletions pkg/ccl/testccl/sqlccl/temp_table_clean_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ import (
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
"github.com/cockroachdb/cockroach/pkg/util/log"
"github.com/cockroachdb/cockroach/pkg/util/stop"
"github.com/cockroachdb/cockroach/pkg/util/syncutil"
)

func TestTenantTempTableCleanup(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

ctx := context.Background()
t.Helper()
Expand Down Expand Up @@ -95,8 +97,7 @@ func TestTenantTempTableCleanup(t *testing.T) {
tc := serverutils.StartNewTestCluster(
t, 3 /* numNodes */, base.TestClusterArgs{ReplicationMode: base.ReplicationManual,
ServerArgs: base.TestServerArgs{
// Disable the default test tenant so that we can start it.
DefaultTestTenant: base.TODOTestTenantDisabled,
DefaultTestTenant: base.TestControlsTenantsExplicitly,
Settings: settings,
},
},
Expand Down
3 changes: 1 addition & 2 deletions pkg/ccl/testccl/sqlccl/tenant_gc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,7 @@ func TestGCTenantJobWaitsForProtectedTimestamps(t *testing.T) {

ctx := context.Background()
args := base.TestServerArgs{
// Disable the implicit default test tenant so that we can start our own.
DefaultTestTenant: base.TODOTestTenantDisabled,
DefaultTestTenant: base.TestControlsTenantsExplicitly,
Knobs: base.TestingKnobs{
JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(),
},
Expand Down
4 changes: 0 additions & 4 deletions pkg/testutils/lint/lint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2317,10 +2317,6 @@ func TestLint(t *testing.T) {
":!ccl/streamingccl/streamingest/stream_ingestion_processor_test.go",
":!ccl/streamingccl/streamproducer/producer_job_test.go",
":!ccl/streamingccl/streamproducer/replication_stream_test.go",
":!ccl/testccl/sqlccl/run_control_test.go",
":!ccl/testccl/sqlccl/temp_table_clean_test.go",
":!ccl/testccl/sqlccl/tenant_gc_test.go",
":!ccl/testccl/sqlstatsccl/sql_stats_test.go",
":!ccl/workloadccl/allccl/all_test.go",
":!cli/democluster/demo_cluster.go",
":!cli/democluster/demo_cluster_test.go",
Expand Down