Skip to content

Commit

Permalink
e2etesting/setup: Make ComponentsInfo private (not needed) #cleanup
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 612749665
  • Loading branch information
gnoack authored and copybara-github committed Mar 5, 2024
1 parent bc231b8 commit 6f868be
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions fleetspeak/src/e2etesting/setup/setup_components.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ type serverInfo struct {
httpsListenPort int
}

// ComponentsInfo contains IDs of connected clients and exec.Cmds for all components
type ComponentsInfo struct {
// componentsInfo contains IDs of connected clients and exec.Cmds for all components
type componentsInfo struct {
masterServerCmd *exec.Cmd
balancerCmd *exec.Cmd
servers []serverInfo
Expand All @@ -43,7 +43,7 @@ type ComponentsInfo struct {
}

// killAll kills all running processes
func (cc *ComponentsInfo) killAll() {
func (cc *componentsInfo) killAll() {
for _, cl := range cc.clientCmds {
if cl != nil {
cl.Process.Kill()
Expand Down Expand Up @@ -355,7 +355,7 @@ func BuildConfigurations(configDir string, serverHosts []string, serverFrontendI
return nil
}

func (cc *ComponentsInfo) start(configDir string, frontendAddress, msAddress string, numServers, numClients int) error {
func (cc *componentsInfo) start(configDir string, frontendAddress, msAddress string, numServers, numClients int) error {
firstAdminPort := 6061

// Start Master server
Expand Down Expand Up @@ -444,7 +444,7 @@ func ConfigureAndStart(t *testing.T, mysqlCredentials MysqlCredentials, frontend
t.Fatalf("Failed to build base Fleetspeak configuration: %v", err)
}

cc := ComponentsInfo{}
cc := componentsInfo{}
err = cc.start(configDir, frontendAddress, msAddress, numServers, numClients)
if err != nil {
cc.killAll()
Expand Down

0 comments on commit 6f868be

Please sign in to comment.