tests: remove direct uses of *TestCluster

TestCluster has an interface. Use it. Release note: None
cockroachdb · Aug 2, 2023 · 6c4fb4e · 6c4fb4e
1 parent 6f29b21
commit 6c4fb4e
Show file tree

Hide file tree

Showing 96 changed files with 808 additions and 739 deletions.
diff --git a/pkg/bench/bench_test.go b/pkg/bench/bench_test.go
@@ -506,7 +506,7 @@ func BenchmarkTracing(b *testing.B) {
 							Tracer:      tr,
 						},
 					})
-				sqlRunner := sqlutils.MakeRoundRobinSQLRunner(tc.Conns[0], tc.Conns[1], tc.Conns[2])
+				sqlRunner := sqlutils.MakeRoundRobinSQLRunner(tc.ServerConn(0), tc.ServerConn(1), tc.ServerConn(2))
 				return sqlRunner, tc.Stopper()
 			},
 		},

diff --git a/pkg/bench/foreachdb.go b/pkg/bench/foreachdb.go
@@ -145,12 +145,12 @@ func benchmarkMultinodeCockroach(b *testing.B, f BenchmarkFn) {
 				DefaultTestTenant: base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(83461),
 			},
 		})
-	if _, err := tc.Conns[0].Exec(`CREATE DATABASE bench`); err != nil {
+	if _, err := tc.ServerConn(0).Exec(`CREATE DATABASE bench`); err != nil {
 		b.Fatal(err)
 	}
 	defer tc.Stopper().Stop(context.TODO())
 
-	f(b, sqlutils.MakeRoundRobinSQLRunner(tc.Conns[0], tc.Conns[1], tc.Conns[2]))
+	f(b, sqlutils.MakeRoundRobinSQLRunner(tc.ServerConn(0), tc.ServerConn(1), tc.ServerConn(2)))
 }
 
 func benchmarkPostgres(b *testing.B, f BenchmarkFn) {

diff --git a/pkg/ccl/backupccl/backup_tenant_test.go b/pkg/ccl/backupccl/backup_tenant_test.go
@@ -45,7 +45,7 @@ func TestBackupTenantImportingTable(t *testing.T) {
 			},
 		})
 	defer tc.Stopper().Stop(ctx)
-	sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
+	sqlDB := sqlutils.MakeSQLRunner(tc.ServerConn(0))
 
 	tenantID := roachpb.MustMakeTenantID(10)
 	tSrv, tSQL := serverutils.StartTenant(t, tc.Server(0), base.TestTenantArgs{

diff --git a/pkg/ccl/backupccl/backup_test.go b/pkg/ccl/backupccl/backup_test.go
diff --git a/pkg/ccl/backupccl/backupinfo/backup_metadata_test.go b/pkg/ccl/backupccl/backupinfo/backup_metadata_test.go
@@ -77,7 +77,7 @@ func TestMetadataSST(t *testing.T) {
 
 	// Check for correct backup metadata on tenant backups.
 	userfile2 := "userfile:///2"
-	_, err := tc.Servers[0].StartTenant(ctx, base.TestTenantArgs{TenantID: roachpb.MustMakeTenantID(10)})
+	_, err := tc.Server(0).StartTenant(ctx, base.TestTenantArgs{TenantID: roachpb.MustMakeTenantID(10)})
 	require.NoError(t, err)
 	sqlDB.Exec(t, `BACKUP TENANT 10 TO $1`, userfile2)
 	checkMetadata(ctx, t, tc, userfile2)
@@ -90,10 +90,10 @@ func checkMetadata(
 		ctx,
 		backupLoc,
 		base.ExternalIODirConfig{},
-		tc.Servers[0].ClusterSettings(),
+		tc.Server(0).ClusterSettings(),
 		blobs.TestEmptyBlobClientFactory,
 		username.RootUserName(),
-		tc.Servers[0].InternalDB().(isql.DB),
+		tc.Server(0).InternalDB().(isql.DB),
 		nil, /* limiters */
 		cloud.NilMetrics,
 	)
@@ -105,7 +105,7 @@ func checkMetadata(
 		t.Fatal(err)
 	}
 
-	srv := tc.Servers[0]
+	srv := tc.Server(0)
 	execCfg := srv.ExecutorConfig().(sql.ExecutorConfig)
 	kmsEnv := backupencryption.MakeBackupKMSEnv(srv.ClusterSettings(), &base.ExternalIODirConfig{},
 		execCfg.InternalDB, username.RootUserName())

diff --git a/pkg/ccl/backupccl/backuprand/backup_rand_test.go b/pkg/ccl/backupccl/backuprand/backup_rand_test.go
@@ -61,12 +61,12 @@ func TestBackupRestoreRandomDataRoundtrips(t *testing.T) {
 	tc := testcluster.StartTestCluster(t, 1, params)
 	defer tc.Stopper().Stop(ctx)
 	tc.ToggleReplicateQueues(false)
-	sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
+	sqlDB := sqlutils.MakeSQLRunner(tc.ServerConn(0))
 	sqlDB.Exec(t, "CREATE DATABASE rand")
 
 	setup := sqlsmith.Setups[sqlsmith.RandTableSetupName](rng)
 	for _, stmt := range setup {
-		if _, err := tc.Conns[0].Exec(stmt); err != nil {
+		if _, err := tc.ServerConn(0).Exec(stmt); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -91,7 +91,7 @@ database_name = 'rand' AND schema_name = 'public'`)
 		}
 		// Note: we do not care how many rows successfully populate
 		// the given table
-		if _, err := randgen.PopulateTableWithRandData(rng, tc.Conns[0], tableName,
+		if _, err := randgen.PopulateTableWithRandData(rng, tc.ServerConn(0), tableName,
 			numInserts); err != nil {
 			t.Fatal(err)
 		}
@@ -106,7 +106,7 @@ database_name = 'rand' AND schema_name = 'public'`)
 		if runSchemaOnlyExtension == "" {
 			var err error
 			tableID := sqlutils.QueryTableID(t, sqlDB.DB, "rand", "public", tableName)
-			expectedData[tableName], err = fingerprintutils.FingerprintTable(ctx, tc.Conns[0], tableID,
+			expectedData[tableName], err = fingerprintutils.FingerprintTable(ctx, tc.ServerConn(0), tableID,
 				fingerprintutils.Stripped())
 			require.NoError(t, err)
 		}
@@ -142,7 +142,7 @@ database_name = 'rand' AND schema_name = 'public'`)
 				"SHOW CREATE %s not equal after RESTORE", tableName)
 			if runSchemaOnlyExtension == "" {
 				tableID := sqlutils.QueryTableID(t, sqlDB.DB, "restoredb", "public", tableName)
-				fingerpint, err := fingerprintutils.FingerprintTable(ctx, tc.Conns[0], tableID,
+				fingerpint, err := fingerprintutils.FingerprintTable(ctx, tc.ServerConn(0), tableID,
 					fingerprintutils.Stripped())
 				require.NoError(t, err)
 				require.Equal(t, expectedData[tableName], fingerpint)
@@ -194,7 +194,7 @@ database_name = 'rand' AND schema_name = 'public'`)
 		tables := buf.String()
 		t.Logf("Testing subset backup/restore %s", tables)
 		sqlDB.Exec(t, fmt.Sprintf(`BACKUP TABLE %s INTO $1`, tables), backupTarget)
-		_, err := tc.Conns[0].Exec(
+		_, err := tc.ServerConn(0).Exec(
 			fmt.Sprintf("RESTORE TABLE %s FROM LATEST IN $1 WITH OPTIONS (into_db='restoredb' %s)", tables, runSchemaOnlyExtension),
 			backupTarget)
 		if err != nil {

diff --git a/pkg/ccl/backupccl/backuptestutils/testutils.go b/pkg/ccl/backupccl/backuptestutils/testutils.go
@@ -122,7 +122,7 @@ func StartBackupRestoreTestCluster(
 	tc := testcluster.StartTestCluster(t, clusterSize, opts.testClusterArgs)
 	opts.initFunc(tc)
 
-	sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
+	sqlDB := sqlutils.MakeSQLRunner(tc.ServerConn(0))
 
 	if opts.bankArgs != nil {
 		const payloadSize = 100
@@ -157,7 +157,7 @@ func StartBackupRestoreTestCluster(
 	}
 
 	return tc, sqlDB, opts.dataDir, func() {
-		CheckForInvalidDescriptors(t, tc.Conns[0])
+		CheckForInvalidDescriptors(t, tc.ServerConn(0))
 		tc.Stopper().Stop(ctx) // cleans up in memory storage's auxiliary dirs
 		dirCleanupFunc()
 	}

diff --git a/pkg/ccl/backupccl/bench_test.go b/pkg/ccl/backupccl/bench_test.go
@@ -127,10 +127,10 @@ func BenchmarkIteratorMemory(b *testing.B) {
 			ctx,
 			storeURI,
 			base.ExternalIODirConfig{},
-			tc.Servers[0].ClusterSettings(),
+			tc.Server(0).ClusterSettings(),
 			blobs.TestEmptyBlobClientFactory,
 			username.RootUserName(),
-			tc.Servers[0].InternalDB().(isql.DB),
+			tc.Server(0).InternalDB().(isql.DB),
 			nil, /* limiters */
 			cloud.NilMetrics,
 		)

diff --git a/pkg/ccl/backupccl/file_sst_sink_test.go b/pkg/ccl/backupccl/file_sst_sink_test.go
@@ -860,10 +860,10 @@ func fileSSTSinkTestSetUp(
 ) (*fileSSTSink, cloud.ExternalStorage) {
 	store, err := cloud.ExternalStorageFromURI(ctx, "userfile:///0",
 		base.ExternalIODirConfig{},
-		tc.Servers[0].ClusterSettings(),
+		tc.Server(0).ClusterSettings(),
 		blobs.TestEmptyBlobClientFactory,
 		username.RootUserName(),
-		tc.Servers[0].InternalDB().(isql.DB),
+		tc.Server(0).InternalDB().(isql.DB),
 		nil, /* limiters */
 		cloud.NilMetrics,
 	)
@@ -876,7 +876,7 @@ func fileSSTSinkTestSetUp(
 		id:       1,
 		enc:      nil,
 		progCh:   progCh,
-		settings: &tc.Servers[0].ClusterSettings().SV,
+		settings: &tc.Server(0).ClusterSettings().SV,
 	}
 
 	sink := makeFileSSTSink(sinkConf, store)

diff --git a/pkg/ccl/backupccl/full_cluster_backup_restore_test.go b/pkg/ccl/backupccl/full_cluster_backup_restore_test.go
@@ -87,7 +87,8 @@ func TestFullClusterBackup(t *testing.T) {
 	allowProgressAfterPreRestore := make(chan struct{})
 	// Closed to signal the zones have been restored.
 	restoredZones := make(chan struct{})
-	for _, server := range tcRestore.Servers {
+	for i := 0; i < tcRestore.NumServers(); i++ {
+		server := tcRestore.Server(i)
 		registry := server.JobRegistry().(*jobs.Registry)
 		registry.TestingWrapResumerConstructor(jobspb.TypeRestore,
 			func(raw jobs.Resumer) jobs.Resumer {
@@ -495,7 +496,8 @@ func TestClusterRestoreSystemTableOrdering(t *testing.T) {
 	defer cleanupEmptyCluster()
 
 	restoredSystemTables := make([]string, 0)
-	for _, server := range tcRestore.Servers {
+	for i := 0; i < tcRestore.NumServers(); i++ {
+		server := tcRestore.Server(i)
 		registry := server.JobRegistry().(*jobs.Registry)
 		registry.TestingWrapResumerConstructor(jobspb.TypeRestore,
 			func(raw jobs.Resumer) jobs.Resumer {
@@ -712,7 +714,8 @@ func TestClusterRestoreFailCleanup(t *testing.T) {
 
 				// Inject a retry error, that returns once.
 				alreadyErrored := false
-				for _, server := range tcRestore.Servers {
+				for i := 0; i < tcRestore.NumServers(); i++ {
+					server := tcRestore.Server(i)
 					registry := server.JobRegistry().(*jobs.Registry)
 					registry.TestingWrapResumerConstructor(jobspb.TypeRestore,
 						func(raw jobs.Resumer) jobs.Resumer {
@@ -744,7 +747,8 @@ func TestClusterRestoreFailCleanup(t *testing.T) {
 		defer cleanupEmptyCluster()
 
 		// Bugger the backup by injecting a failure while restoring the system data.
-		for _, server := range tcRestore.Servers {
+		for i := 0; i < tcRestore.NumServers(); i++ {
+			server := tcRestore.Server(i)
 			registry := server.JobRegistry().(*jobs.Registry)
 			registry.TestingWrapResumerConstructor(jobspb.TypeRestore,
 				func(raw jobs.Resumer) jobs.Resumer {
@@ -787,7 +791,8 @@ func TestClusterRestoreFailCleanup(t *testing.T) {
 		defer cleanupEmptyCluster()
 
 		// Bugger the backup by injecting a failure while restoring the system data.
-		for _, server := range tcRestore.Servers {
+		for i := 0; i < tcRestore.NumServers(); i++ {
+			server := tcRestore.Server(i)
 			registry := server.JobRegistry().(*jobs.Registry)
 			registry.TestingWrapResumerConstructor(jobspb.TypeRestore,
 				func(raw jobs.Resumer) jobs.Resumer {
@@ -1065,7 +1070,7 @@ func TestClusterRevisionDoesNotBackupOptOutSystemTables(t *testing.T) {
 	defer log.Scope(t).Close(t)
 
 	tc, _, _, cleanup := backupRestoreTestSetup(t, singleNode, 10, InitManualReplication)
-	conn := tc.Conns[0]
+	conn := tc.ServerConn(0)
 	sqlDB := sqlutils.MakeSQLRunner(conn)
 	defer cleanup()
 

diff --git a/pkg/ccl/backupccl/generative_split_and_scatter_processor_test.go b/pkg/ccl/backupccl/generative_split_and_scatter_processor_test.go
@@ -87,7 +87,7 @@ func TestRunGenerativeSplitAndScatterContextCancel(t *testing.T) {
 	uri := localFoo + "/" + backups[0][0]
 
 	codec := keys.MakeSQLCodec(s0.RPCContext().TenantID)
-	backupTableDesc := desctestutils.TestingGetPublicTableDescriptor(tc.Servers[0].DB(), codec, "data", "bank")
+	backupTableDesc := desctestutils.TestingGetPublicTableDescriptor(tc.Server(0).DB(), codec, "data", "bank")
 	backupStartKey := backupTableDesc.PrimaryIndexSpan(codec).Key
 
 	spec := makeTestingGenerativeSplitAndScatterSpec(
@@ -171,7 +171,7 @@ func TestRunGenerativeSplitAndScatterRandomizedDestOnFailScatter(t *testing.T) {
 	uri := localFoo + "/" + backups[0][0]
 
 	codec := keys.MakeSQLCodec(s0.RPCContext().TenantID)
-	backupTableDesc := desctestutils.TestingGetPublicTableDescriptor(tc.Servers[0].DB(), codec, "data", "bank")
+	backupTableDesc := desctestutils.TestingGetPublicTableDescriptor(tc.Server(0).DB(), codec, "data", "bank")
 	backupStartKey := backupTableDesc.PrimaryIndexSpan(codec).Key
 
 	spec := makeTestingGenerativeSplitAndScatterSpec(

diff --git a/pkg/ccl/backupccl/restore_mid_schema_change_test.go b/pkg/ccl/backupccl/restore_mid_schema_change_test.go
@@ -220,7 +220,7 @@ func restoreMidSchemaChange(
 			tc.Stopper().Stop(ctx)
 			dirCleanupFn()
 		}()
-		sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
+		sqlDB := sqlutils.MakeSQLRunner(tc.ServerConn(0))
 
 		symlink := filepath.Join(dir, "foo")
 		err := os.Symlink(backupDir, symlink)

diff --git a/pkg/ccl/backupccl/restore_old_versions_test.go b/pkg/ccl/backupccl/restore_old_versions_test.go
@@ -148,7 +148,7 @@ func restoreOldVersionClusterTest(exportDir string) func(t *testing.T) {
 				ExternalIODir:     externalDir,
 			},
 		})
-		sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
+		sqlDB := sqlutils.MakeSQLRunner(tc.ServerConn(0))
 		defer func() {
 			tc.Stopper().Stop(ctx)
 			dirCleanup()

diff --git a/pkg/ccl/backupccl/system_schema_test.go b/pkg/ccl/backupccl/system_schema_test.go
@@ -35,7 +35,7 @@ func TestAllSystemTablesHaveBackupConfig(t *testing.T) {
 				DefaultTestTenant: base.TestControlsTenantsExplicitly,
 			}})
 	defer tc.Stopper().Stop(ctx)
-	systemSQL := sqlutils.MakeSQLRunner(tc.Conns[0])
+	systemSQL := sqlutils.MakeSQLRunner(tc.ServerConn(0))
 
 	_, tSQL := serverutils.StartTenant(t, tc.Server(0), base.TestTenantArgs{
 		TenantID:     roachpb.MustMakeTenantID(10),

diff --git a/pkg/ccl/backupccl/tenant_backup_nemesis_test.go b/pkg/ccl/backupccl/tenant_backup_nemesis_test.go
@@ -73,7 +73,7 @@ func TestTenantBackupWithCanceledImport(t *testing.T) {
 	hostSQLDB.Exec(t, "SET CLUSTER SETTING storage.mvcc.range_tombstones.enabled = true")
 	hostSQLDB.Exec(t, "ALTER TENANT ALL SET CLUSTER SETTING storage.mvcc.range_tombstones.enabled = true")
 
-	tenant10, err := tc.Servers[0].StartTenant(ctx, base.TestTenantArgs{
+	tenant10, err := tc.Server(0).StartTenant(ctx, base.TestTenantArgs{
 		TenantID: roachpb.MustMakeTenantID(10),
 		TestingKnobs: base.TestingKnobs{
 			JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(),
@@ -102,7 +102,7 @@ func TestTenantBackupWithCanceledImport(t *testing.T) {
 	hostSQLDB.Exec(t, "BACKUP TENANT 10 INTO LATEST IN 'nodelocal://1/tenant-backup'")
 	hostSQLDB.Exec(t, "RESTORE TENANT 10 FROM LATEST IN 'nodelocal://1/tenant-backup' WITH virtual_cluster_name = 'tenant-11'")
 
-	tenant11, err := tc.Servers[0].StartTenant(ctx, base.TestTenantArgs{
+	tenant11, err := tc.Server(0).StartTenant(ctx, base.TestTenantArgs{
 		TenantName:          "tenant-11",
 		DisableCreateTenant: true,
 	})
@@ -147,7 +147,7 @@ func TestTenantBackupNemesis(t *testing.T) {
 	hostSQLDB.Exec(t, "SET CLUSTER SETTING storage.mvcc.range_tombstones.enabled = true")
 	hostSQLDB.Exec(t, "ALTER TENANT ALL SET CLUSTER SETTING storage.mvcc.range_tombstones.enabled = true")
 
-	tenant10, err := tc.Servers[0].StartTenant(ctx, base.TestTenantArgs{
+	tenant10, err := tc.Server(0).StartTenant(ctx, base.TestTenantArgs{
 		TenantID: roachpb.MustMakeTenantID(10),
 		TestingKnobs: base.TestingKnobs{
 			JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(),
@@ -248,7 +248,7 @@ func TestTenantBackupNemesis(t *testing.T) {
 	//
 	// We check bank.bank which has had the workload running against it
 	// and any table from a completed nemesis.
-	tenant11, err := tc.Servers[0].StartTenant(ctx, base.TestTenantArgs{
+	tenant11, err := tc.Server(0).StartTenant(ctx, base.TestTenantArgs{
 		TenantName:          "tenant-11",
 		DisableCreateTenant: true,
 	})

diff --git a/pkg/ccl/changefeedccl/changefeed_test.go b/pkg/ccl/changefeedccl/changefeed_test.go
@@ -8000,7 +8000,7 @@ func TestChangefeedExecLocality(t *testing.T) {
 	defer tc.Stopper().Stop(ctx)
 	tc.ToggleReplicateQueues(false)
 
-	n2 := sqlutils.MakeSQLRunner(tc.Conns[1])
+	n2 := sqlutils.MakeSQLRunner(tc.ServerConn(1))
 
 	// Setup a table with at least one range on each node to be sure we will see a
 	// file from that node if it isn't excluded by filter. Relocate can fail with

diff --git a/pkg/ccl/cloudccl/amazon/s3_connection_test.go b/pkg/ccl/cloudccl/amazon/s3_connection_test.go
@@ -45,7 +45,7 @@ func TestS3ExternalConnection(t *testing.T) {
 	defer tc.Stopper().Stop(context.Background())
 
 	tc.WaitForNodeLiveness(t)
-	sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
+	sqlDB := sqlutils.MakeSQLRunner(tc.ServerConn(0))
 
 	// Setup some dummy data.
 	sqlDB.Exec(t, `CREATE DATABASE foo`)
@@ -198,7 +198,7 @@ func TestAWSKMSExternalConnection(t *testing.T) {
 	defer tc.Stopper().Stop(context.Background())
 
 	tc.WaitForNodeLiveness(t)
-	sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
+	sqlDB := sqlutils.MakeSQLRunner(tc.ServerConn(0))
 
 	// Setup some dummy data.
 	sqlDB.Exec(t, `CREATE DATABASE foo`)
@@ -307,7 +307,7 @@ func TestAWSKMSExternalConnectionAssumeRole(t *testing.T) {
 	defer tc.Stopper().Stop(context.Background())
 
 	tc.WaitForNodeLiveness(t)
-	sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
+	sqlDB := sqlutils.MakeSQLRunner(tc.ServerConn(0))
 
 	// Setup some dummy data.
 	sqlDB.Exec(t, `CREATE DATABASE foo`)

diff --git a/pkg/ccl/cloudccl/azure/azure_connection_test.go b/pkg/ccl/cloudccl/azure/azure_connection_test.go
@@ -71,7 +71,7 @@ func TestExternalConnections(t *testing.T) {
 	defer tc.Stopper().Stop(context.Background())
 
 	tc.WaitForNodeLiveness(t)
-	sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
+	sqlDB := sqlutils.MakeSQLRunner(tc.ServerConn(0))
 
 	// Setup some dummy data.
 	sqlDB.Exec(t, `CREATE DATABASE foo`)

diff --git a/pkg/ccl/cloudccl/gcp/gcp_connection_test.go b/pkg/ccl/cloudccl/gcp/gcp_connection_test.go
@@ -50,7 +50,7 @@ func TestGCPKMSExternalConnection(t *testing.T) {
 	defer tc.Stopper().Stop(context.Background())
 
 	tc.WaitForNodeLiveness(t)
-	sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
+	sqlDB := sqlutils.MakeSQLRunner(tc.ServerConn(0))
 
 	// Setup some dummy data.
 	sqlDB.Exec(t, `CREATE DATABASE foo`)
@@ -178,7 +178,7 @@ func TestGCPKMSExternalConnectionAssumeRole(t *testing.T) {
 	defer tc.Stopper().Stop(context.Background())
 
 	tc.WaitForNodeLiveness(t)
-	sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
+	sqlDB := sqlutils.MakeSQLRunner(tc.ServerConn(0))
 
 	// Setup some dummy data.
 	sqlDB.Exec(t, `CREATE DATABASE foo`)
@@ -305,7 +305,7 @@ func TestGCPAssumeRoleExternalConnection(t *testing.T) {
 	defer tc.Stopper().Stop(context.Background())
 
 	tc.WaitForNodeLiveness(t)
-	sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
+	sqlDB := sqlutils.MakeSQLRunner(tc.ServerConn(0))
 
 	// Setup some dummy data.
 	sqlDB.Exec(t, `CREATE DATABASE foo`)
@@ -452,7 +452,7 @@ func TestGCPExternalConnection(t *testing.T) {
 	defer tc.Stopper().Stop(context.Background())
 
 	tc.WaitForNodeLiveness(t)
-	sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
+	sqlDB := sqlutils.MakeSQLRunner(tc.ServerConn(0))
 
 	// Setup some dummy data.
 	sqlDB.Exec(t, `CREATE DATABASE foo`)

diff --git a/pkg/ccl/importerccl/ccl_test.go b/pkg/ccl/importerccl/ccl_test.go
@@ -424,7 +424,7 @@ func TestImportInTenant(t *testing.T) {
 	}
 	tc := testcluster.StartTestCluster(t, 1, base.TestClusterArgs{ServerArgs: args})
 	defer tc.Stopper().Stop(ctx)
-	conn := tc.Conns[0]
+	conn := tc.ServerConn(0)
 	sqlDB := sqlutils.MakeSQLRunner(conn)
 
 	// Setup a few tenants, each with a different table.