server: unexport TestServer

Release note: None

Author: knz

pkg/server/connectivity_test.go

@@ -46,7 +46,7 @@ func TestClusterConnectivity(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	// TODO(irfansharif): Teach TestServer to accept a list of join addresses
+	// TODO(irfansharif): Teach testServer to accept a list of join addresses
 	// instead of just one.
 
 	var testConfigurations = []struct {

pkg/server/server.go

@@ -1522,7 +1522,7 @@ func (s *Server) PreStart(ctx context.Context) error {
 	// Register the Migration service, to power internal crdb upgrades.
 	migrationServer := &migrationServer{server: s}
 	serverpb.RegisterMigrationServer(s.grpc.Server, migrationServer)
-	s.migrationServer = migrationServer // only for testing via TestServer
+	s.migrationServer = migrationServer // only for testing via testServer
 
 	// Register the KeyVisualizer Server
 	keyvispb.RegisterKeyVisualizerServer(s.grpc.Server, s.keyVisualizerServer)

pkg/server/server_controller_channel_orchestrator.go

@@ -45,7 +45,7 @@ func newChannelOrchestrator(
 
 // serverStateUsingChannels coordinates the lifecycle of a tenant
 // server. It ensures sane concurrent behavior between:
-// - requests to start a server manually, e.g. via TestServer;
+// - requests to start a server manually, e.g. via testServer;
 // - async changes to the tenant service mode;
 // - quiescence of the outer stopper;
 // - RPC drain requests on the tenant server;

pkg/server/server_controller_test.go

@@ -32,7 +32,7 @@ func TestServerController(t *testing.T) {
 	})
 	defer s.Stopper().Stop(ctx)
 
-	ts := s.(*TestServer)
+	ts := s.(*testServer)
 
 	d, err := ts.serverController.getServer(ctx, "system")
 	require.NoError(t, err)

pkg/server/server_special_test.go

@@ -31,15 +31,15 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// Tests in this file have a linter exception against casting to *TestServer.
+// Tests in this file have a linter exception against casting to *testServer.
 
 func TestPanicRecovery(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.ScopeWithoutShowLogs(t).Close(t)
 
 	s := serverutils.StartServerOnly(t, base.TestServerArgs{})
 	defer s.Stopper().Stop(context.Background())
-	ts := s.(*TestServer)
+	ts := s.(*testServer)
 
 	// Enable a test-only endpoint that induces a panic.
 	ts.http.mux.Handle("/panic", http.HandlerFunc(func(http.ResponseWriter, *http.Request) {
@@ -109,7 +109,7 @@ func TestSocketAutoNumbering(t *testing.T) {
 	_, expectedPort, err := addr.SplitHostPort(s.SQLAddr(), "")
 	require.NoError(t, err)
 
-	if socketPath := s.(*TestServer).Cfg.SocketFile; !strings.HasSuffix(socketPath, "."+expectedPort) {
+	if socketPath := s.(*testServer).Cfg.SocketFile; !strings.HasSuffix(socketPath, "."+expectedPort) {
 		t.Errorf("expected unix socket ending with port %q, got %q", expectedPort, socketPath)
 	}
 }
@@ -127,7 +127,7 @@ func TestInternalSQL(t *testing.T) {
 	conf.User = "root"
 	// Configure pgx to connect on the loopback listener.
 	conf.DialFunc = func(ctx context.Context, network, addr string) (net.Conn, error) {
-		return s.(*TestServer).Server.loopbackPgL.Connect(ctx)
+		return s.(*testServer).Server.loopbackPgL.Connect(ctx)
 	}
 	conn, err := pgx.ConnectConfig(ctx, conf)
 	require.NoError(t, err)

pkg/server/server_test.go

@@ -204,7 +204,7 @@ func TestPlainHTTPServer(t *testing.T) {
 	})
 	defer s.Stopper().Stop(context.Background())
 
-	// First, make sure that the TestServer's built-in client interface
+	// First, make sure that the testServer's built-in client interface
 	// still works in insecure mode.
 	var data serverpb.JSONResponse
 	testutils.SucceedsSoon(t, func() error {

pkg/server/settings_cache_test.go

@@ -79,11 +79,11 @@ func TestCachedSettingsServerRestart(t *testing.T) {
 		},
 	}
 	var settingsCache []roachpb.KeyValue
-	testServer := serverutils.StartServerOnly(t, serverArgs)
-	closedts.TargetDuration.Override(ctx, &testServer.ClusterSettings().SV, 10*time.Millisecond)
-	closedts.SideTransportCloseInterval.Override(ctx, &testServer.ClusterSettings().SV, 10*time.Millisecond)
+	ts := serverutils.StartServerOnly(t, serverArgs)
+	closedts.TargetDuration.Override(ctx, &ts.ClusterSettings().SV, 10*time.Millisecond)
+	closedts.SideTransportCloseInterval.Override(ctx, &ts.ClusterSettings().SV, 10*time.Millisecond)
 	testutils.SucceedsSoon(t, func() error {
-		store, err := testServer.GetStores().(*kvserver.Stores).GetStore(1)
+		store, err := ts.GetStores().(*kvserver.Stores).GetStore(1)
 		if err != nil {
 			return err
 		}
@@ -97,7 +97,7 @@ func TestCachedSettingsServerRestart(t *testing.T) {
 		settingsCache = settings
 		return nil
 	})
-	testServer.Stopper().Stop(context.Background())
+	ts.Stopper().Stop(context.Background())
 
 	s, err := serverutils.NewServer(serverArgs)
 	if err != nil {
@@ -109,7 +109,7 @@ func TestCachedSettingsServerRestart(t *testing.T) {
 	{
 		getDialOpts := s.RPCContext().GRPCDialOptions
 
-		initConfig := newInitServerConfig(ctx, s.(*TestServer).Server.cfg, getDialOpts)
+		initConfig := newInitServerConfig(ctx, s.(*testServer).Server.cfg, getDialOpts)
 		inspectState, err := inspectEngines(
 			context.Background(),
 			s.Engines(),