*: remove remaining references of the meta issue

yuzefovich · yuzefovich · commit 2fcfe8005f9c · 2025-11-05T16:23:04.000-08:00
Going forward, 76378 will be the meta issue tracking all remaining work
for investigating and enabling test tenants across our tests. This
commit removes the last explicit mentions of the issue by replacing with
specific ones or enabling test tenants on some packages that happened to
just work.

Release note: None
diff --git a/pkg/bench/rttanalysis/bench_test.go b/pkg/bench/rttanalysis/bench_test.go
@@ -25,7 +25,7 @@ func TestMain(m *testing.M) {
 	serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
 
 	defer serverutils.TestingSetDefaultTenantSelectionOverride(
-		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(76378),
+		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(83461),
 	)()
 
 	os.Exit(m.Run())
diff --git a/pkg/bench/tpcc/main_test.go b/pkg/bench/tpcc/main_test.go
@@ -23,7 +23,7 @@ func TestMain(m *testing.M) {
 	serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
 
 	defer serverutils.TestingSetDefaultTenantSelectionOverride(
-		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(76378),
+		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(83461),
 	)()
 
 	os.Exit(m.Run())
diff --git a/pkg/ccl/changefeedccl/tableset/main_test.go b/pkg/ccl/changefeedccl/tableset/main_test.go
@@ -26,7 +26,7 @@ func TestMain(m *testing.M) {
 	serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
 
 	defer serverutils.TestingSetDefaultTenantSelectionOverride(
-		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(76378),
+		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(142799),
 	)()
 
 	os.Exit(m.Run())
diff --git a/pkg/ccl/multitenantccl/tenantcostclient/tenant_side_test.go b/pkg/ccl/multitenantccl/tenantcostclient/tenant_side_test.go
@@ -1200,8 +1200,6 @@ func TestSQLLivenessExemption(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	// This test fails when run with the default test tenant. Disabling and
-	// tracking with #76378.
 	hostServer, hostDB, hostKV := serverutils.StartServer(t,
 		base.TestServerArgs{DefaultTestTenant: base.TestControlsTenantsExplicitly})
 	defer hostServer.Stopper().Stop(context.Background())
diff --git a/pkg/crosscluster/physical/replication_random_client_test.go b/pkg/crosscluster/physical/replication_random_client_test.go
@@ -175,8 +175,6 @@ func TestStreamIngestionJobWithRandomClient(t *testing.T) {
 	var revertRangeTargetTime hlc.Timestamp
 	params := base.TestClusterArgs{
 		ServerArgs: base.TestServerArgs{
-			// Test hangs with test tenant. More investigation is required.
-			// Tracked with #76378.
 			DefaultTestTenant: base.TestControlsTenantsExplicitly,
 			Knobs: base.TestingKnobs{
 				TenantTestingKnobs: &sql.TenantTestingKnobs{
diff --git a/pkg/jobs/jobfrontier/BUILD.bazel b/pkg/jobs/jobfrontier/BUILD.bazel
@@ -31,7 +31,6 @@ go_test(
         "//pkg/server",
         "//pkg/sql/isql",
         "//pkg/testutils/serverutils",
-        "//pkg/testutils/testcluster",
         "//pkg/util/hlc",
         "//pkg/util/leaktest",
         "//pkg/util/log",
diff --git a/pkg/jobs/jobfrontier/main_test.go b/pkg/jobs/jobfrontier/main_test.go
@@ -9,23 +9,18 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/security/securityassets"
 	"github.com/cockroachdb/cockroach/pkg/security/securitytest"
 	"github.com/cockroachdb/cockroach/pkg/server"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
-	"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
 	"github.com/cockroachdb/cockroach/pkg/util/randutil"
 )
 
 func TestMain(m *testing.M) {
 	securityassets.SetLoader(securitytest.EmbeddedAssets)
 	randutil.SeedForTests()
 	serverutils.InitTestServerFactory(server.TestServerFactory)
-	serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
-	defer serverutils.TestingSetDefaultTenantSelectionOverride(
-		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(76378),
-	)()
+
 	os.Exit(m.Run())
 }
 
diff --git a/pkg/jobs/main_test.go b/pkg/jobs/main_test.go
@@ -24,7 +24,7 @@ func TestMain(m *testing.M) {
 	serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
 
 	defer serverutils.TestingSetDefaultTenantSelectionOverride(
-		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(76378),
+		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(156331),
 	)()
 
 	os.Exit(m.Run())
diff --git a/pkg/kv/kvclient/kvcoord/main_test.go b/pkg/kv/kvclient/kvcoord/main_test.go
@@ -26,7 +26,7 @@ func TestMain(m *testing.M) {
 	randutil.SeedForTests()
 
 	defer serverutils.TestingSetDefaultTenantSelectionOverride(
-		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(76378),
+		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(156327),
 	)()
 
 	defer serverutils.TestingGlobalDRPCOption(
diff --git a/pkg/kv/kvclient/kvcoord/txncorrectnesstest/BUILD.bazel b/pkg/kv/kvclient/kvcoord/txncorrectnesstest/BUILD.bazel
@@ -16,7 +16,6 @@ go_test(
         "write_skew_anomaly_test.go",
     ],
     deps = [
-        "//pkg/base",
         "//pkg/kv",
         "//pkg/kv/kvclient/kvcoord",  # keep
         "//pkg/kv/kvserver",
diff --git a/pkg/kv/kvclient/kvcoord/txncorrectnesstest/main_test.go b/pkg/kv/kvclient/kvcoord/txncorrectnesstest/main_test.go
@@ -9,25 +9,17 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/security/securityassets"
 	"github.com/cockroachdb/cockroach/pkg/security/securitytest"
 	"github.com/cockroachdb/cockroach/pkg/server"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
 	"github.com/cockroachdb/cockroach/pkg/util/randutil"
 )
 
-func init() {
-	securityassets.SetLoader(securitytest.EmbeddedAssets)
-}
-
 func TestMain(m *testing.M) {
+	securityassets.SetLoader(securitytest.EmbeddedAssets)
 	serverutils.InitTestServerFactory(server.TestServerFactory)
 	randutil.SeedForTests()
 
-	defer serverutils.TestingSetDefaultTenantSelectionOverride(
-		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(76378),
-	)()
-
 	os.Exit(m.Run())
 }
diff --git a/pkg/kv/main_test.go b/pkg/kv/main_test.go
@@ -26,7 +26,7 @@ func TestMain(m *testing.M) {
 	serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
 
 	defer serverutils.TestingSetDefaultTenantSelectionOverride(
-		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(76378),
+		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(156327),
 	)()
 
 	defer serverutils.TestingGlobalDRPCOption(
diff --git a/pkg/server/application_api/storage_inspection_test.go b/pkg/server/application_api/storage_inspection_test.go
@@ -79,9 +79,12 @@ func TestAdminAPINonTableStats(t *testing.T) {
 func TestRangeCount(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
+
+	skip.UnderRace(t, "too slow under stressrace")
+
 	testCluster := serverutils.StartCluster(t, 3, base.TestClusterArgs{
 		ServerArgs: base.TestServerArgs{
-			DefaultTestTenant: base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(76378),
+			DefaultTestTenant: base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(81590),
 		},
 	})
 	require.NoError(t, testCluster.WaitForFullReplication())
diff --git a/pkg/upgrade/upgrades/main_test.go b/pkg/upgrade/upgrades/main_test.go
@@ -23,7 +23,7 @@ func TestMain(m *testing.M) {
 	serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
 
 	defer serverutils.TestingSetDefaultTenantSelectionOverride(
-		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(76378),
+		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(156332),
 	)()
 
 	os.Exit(m.Run())
diff --git a/pkg/util/log/eventlog/BUILD.bazel b/pkg/util/log/eventlog/BUILD.bazel
@@ -41,7 +41,6 @@ go_test(
         "//pkg/testutils",
         "//pkg/testutils/serverutils",
         "//pkg/testutils/sqlutils",
-        "//pkg/testutils/testcluster",
         "//pkg/util/leaktest",
         "//pkg/util/log",
         "//pkg/util/log/logtestutils",
diff --git a/pkg/util/log/eventlog/eventlog_test.go b/pkg/util/log/eventlog/eventlog_test.go
@@ -40,8 +40,9 @@ func TestWriter(t *testing.T) {
 	defer log.Scope(t).Close(t)
 
 	ctx := context.Background()
-	s, conn, _ := serverutils.StartServer(t, base.TestServerArgs{})
-	defer s.Stopper().Stop(ctx)
+	srv, conn, _ := serverutils.StartServer(t, base.TestServerArgs{})
+	defer srv.Stopper().Stop(ctx)
+	s := srv.ApplicationLayer()
 
 	testCases := []struct {
 		instanceId int
@@ -59,7 +60,7 @@ func TestWriter(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(fmt.Sprintf("writeAsync=%t", tc.writeAsync), func(t *testing.T) {
 			ambientCtx := log.MakeServerAmbientContext(nil, &ServerId{instanceId: tc.instanceId})
-			writer := eventlog.NewWriter(s.InternalDB().(isql.DB), tc.writeAsync, s.Stopper(), ambientCtx, s.ClusterSettings())
+			writer := eventlog.NewWriter(s.InternalDB().(isql.DB), tc.writeAsync, s.AppStopper(), ambientCtx, s.ClusterSettings())
 			// This can be any event type
 			event := logtestutils.TestEvent{Timestamp: timeutil.Now().UnixNano()}
 
diff --git a/pkg/util/log/eventlog/main_test.go b/pkg/util/log/eventlog/main_test.go
@@ -9,22 +9,15 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/security/securityassets"
 	"github.com/cockroachdb/cockroach/pkg/security/securitytest"
 	"github.com/cockroachdb/cockroach/pkg/server"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
-	"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
 )
 
 func TestMain(m *testing.M) {
 	securityassets.SetLoader(securitytest.EmbeddedAssets)
 	serverutils.InitTestServerFactory(server.TestServerFactory)
-	serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
-
-	defer serverutils.TestingSetDefaultTenantSelectionOverride(
-		base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(76378),
-	)()
 
 	os.Exit(m.Run())
 }
