Skip to content

Commit 3bae70a

Browse files
committed
base: remove TODOTestTenantDisabled
All test tenant skips now have specific issues. Release note: None
1 parent 3245e2d commit 3bae70a

File tree

5 files changed

+4
-98
lines changed

5 files changed

+4
-98
lines changed

pkg/backup/datadriven_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,8 @@ func (d *datadrivenTestState) getSQLDBForVC(
344344
// - testingKnobCfg: specifies a key to a hardcoded testingKnob configuration
345345
//
346346
// - disable-tenant : ensures the test is never run in a multitenant environment by
347-
// setting testserverargs.DefaultTestTenant to base.TODOTestTenantDisabled.
347+
// setting testserverargs.DefaultTestTenant to
348+
// base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142798).
348349
//
349350
// - "upgrade-cluster version=<version>"
350351
// Upgrade the cluster version of the active cluster to the passed in

pkg/base/test_server_args.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -379,11 +379,6 @@ var (
379379
// to use TestTenantProbabilistic or TestTenantProbabilisticOnly.
380380
SharedTestTenantAlwaysEnabled = DefaultTestTenantOptions{testBehavior: ttEnabled | ttSharedProcess, allowAdditionalTenants: true}
381381

382-
// TODOTestTenantDisabled should not be used anymore. Use the
383-
// other values instead.
384-
// TODO(#76378): Review existing tests and use the proper value instead.
385-
TODOTestTenantDisabled = DefaultTestTenantOptions{testBehavior: ttDisabled, allowAdditionalTenants: true}
386-
387382
// TestRequiresExplicitSQLConnection is used when the test is unable to pass
388383
// the cluster as an option in the connection URL. The test could still
389384
// probabilistically use an external process test virtual cluster, but

pkg/cmd/github-pull-request-make/testdata/new_test.diff

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ index 6c20afaef23..879494bdadd 100644
3131
+
3232
+ ctx := context.Background()
3333
+
34-
+ srv, db, _ := serverutils.StartServer(t, base.TestServerArgs{DefaultTestTenant: base.TODOTestTenantDis
35-
abled})
34+
+ srv, db, _ := serverutils.StartServer(t, base.TestServerArgs{})
3635
+ defer srv.Stopper().Stop(ctx)
3736
+
3837
+ sql := sqlutils.MakeSQLRunner(db)

pkg/sql/schemachanger/sctest/test_server_factory.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ func (f SingleNodeTestClusterFactory) Start(ctx context.Context, t *testing.T) T
117117
UseTransactionalDescIDGenerator: true,
118118
},
119119
},
120-
// TODO(postamar): remove this
121-
DefaultTestTenant: base.TODOTestTenantDisabled,
120+
DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(142814),
122121
}
123122
if f.server != nil {
124123
args.Knobs.Server = f.server

pkg/testutils/lint/lint_test.go

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -2506,94 +2506,6 @@ func TestLint(t *testing.T) {
25062506
}
25072507
})
25082508

2509-
// TODO(yuzefovich): remove this linter when #76378 is resolved.
2510-
t.Run("TestTODOTestTenantDisabled", func(t *testing.T) {
2511-
t.Parallel()
2512-
cmd, stderr, filter, err := dirCmd(
2513-
pkgDir,
2514-
"git",
2515-
"grep",
2516-
"-nE",
2517-
`base\.TODOTestTenantDisabled`,
2518-
"--",
2519-
"*",
2520-
":!backup/backup_test.go",
2521-
":!backup/backuprand/backup_rand_test.go",
2522-
":!backup/backuptestutils/testutils.go",
2523-
":!backup/create_scheduled_backup_test.go",
2524-
":!backup/datadriven_test.go",
2525-
":!backup/full_cluster_backup_restore_test.go",
2526-
":!backup/restore_old_versions_test.go",
2527-
":!backup/utils_test.go",
2528-
":!ccl/changefeedccl/alter_changefeed_test.go",
2529-
":!ccl/changefeedccl/changefeed_test.go",
2530-
":!ccl/changefeedccl/helpers_test.go",
2531-
":!ccl/changefeedccl/parquet_test.go",
2532-
":!ccl/changefeedccl/scheduled_changefeed_test.go",
2533-
":!ccl/kvccl/kvfollowerreadsccl/boundedstaleness_test.go",
2534-
":!ccl/kvccl/kvfollowerreadsccl/followerreads_test.go",
2535-
":!ccl/kvccl/kvtenantccl/upgradeccl/tenant_upgrade_test.go",
2536-
":!ccl/multiregionccl/cold_start_latency_test.go",
2537-
":!ccl/multiregionccl/datadriven_test.go",
2538-
":!ccl/multiregionccl/multiregionccltestutils/testutils.go",
2539-
":!ccl/multiregionccl/regional_by_row_test.go",
2540-
":!ccl/multiregionccl/unique_test.go",
2541-
":!ccl/partitionccl/drop_test.go",
2542-
":!ccl/partitionccl/partition_test.go",
2543-
":!ccl/partitionccl/zone_test.go",
2544-
":!ccl/serverccl/admin_test.go",
2545-
":!crosscluster/replicationtestutils/testutils.go",
2546-
":!crosscluster/streamclient/partitioned_stream_client_test.go",
2547-
":!crosscluster/physical/replication_random_client_test.go",
2548-
":!crosscluster/physical/stream_ingestion_job_test.go",
2549-
":!crosscluster/physical/stream_ingestion_processor_test.go",
2550-
":!crosscluster/producer/producer_job_test.go",
2551-
":!crosscluster/producer/replication_stream_test.go",
2552-
":!ccl/workloadccl/allccl/all_test.go",
2553-
":!cli/democluster/demo_cluster.go",
2554-
":!cli/democluster/demo_cluster_test.go",
2555-
":!server/application_api/config_test.go",
2556-
":!server/application_api/dbconsole_test.go",
2557-
":!server/application_api/events_test.go",
2558-
":!server/application_api/insights_test.go",
2559-
":!server/application_api/jobs_test.go",
2560-
":!server/application_api/query_plan_test.go",
2561-
":!server/application_api/security_test.go",
2562-
":!server/application_api/zcfg_test.go",
2563-
":!server/grpc_gateway_test.go",
2564-
":!server/multi_store_test.go",
2565-
":!server/storage_api/decommission_test.go",
2566-
":!server/storage_api/health_test.go",
2567-
":!server/storage_api/rangelog_test.go",
2568-
":!server/testserver.go",
2569-
":!sql/schemachanger/sctest/test_server_factory.go",
2570-
":!sql/server_params_test.go",
2571-
":!sql/ttl/ttljob/ttljob_test.go",
2572-
":!testutils/lint/lint_test.go",
2573-
":!ts/server_test.go",
2574-
":!upgrade/upgrademanager/manager_external_test.go",
2575-
)
2576-
if err != nil {
2577-
t.Fatal(err)
2578-
}
2579-
2580-
if err := cmd.Start(); err != nil {
2581-
t.Fatal(err)
2582-
}
2583-
2584-
if err := stream.ForEach(filter, func(s string) {
2585-
t.Errorf("\n%s <- new usages of base.TODOTestTenantDisabled are forbidden", s)
2586-
}); err != nil {
2587-
t.Error(err)
2588-
}
2589-
2590-
if err := cmd.Wait(); err != nil {
2591-
if out := stderr.String(); len(out) > 0 {
2592-
t.Fatalf("err=%s, stderr=%s", err, out)
2593-
}
2594-
}
2595-
})
2596-
25972509
// This linter prohibits ignoring the context.CancelFunc that is returned on
25982510
// stop.Stopper.WithCancelOnQuiesce call (which can result in a memory
25992511
// leak).

0 commit comments

Comments
 (0)