Skip to content

Commit 2f40eaa

Browse files
laines-itoleg-jukovec
authored andcommitted
helpers: typed args instead of any in pool_helper
Changed signature of ProcessListenOnInstance and ListenOnInstanceArgs using ListenOnInstanceArgs and CheckStatusesArgs instead of interface{}. Closes #485
1 parent a5e864a commit 2f40eaa

1 file changed

Lines changed: 12 additions & 22 deletions

File tree

test_helpers/pool_helper.go

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -61,26 +61,21 @@ func comparePortMaps(expected map[string]bool, actual map[string]bool) error {
6161
return nil
6262
}
6363

64-
func CheckPoolStatuses(args interface{}) error {
65-
checkArgs, ok := args.(CheckStatusesArgs)
66-
if !ok {
67-
return fmt.Errorf("incorrect args")
68-
}
69-
70-
connected, _ := checkArgs.ConnPool.ConnectedNow(checkArgs.Mode)
71-
if connected != checkArgs.ExpectedPoolStatus {
64+
func CheckPoolStatuses(args CheckStatusesArgs) error {
65+
connected, _ := args.ConnPool.ConnectedNow(args.Mode)
66+
if connected != args.ExpectedPoolStatus {
7267
return fmt.Errorf(
7368
"incorrect connection pool status: expected status %t actual status %t",
74-
checkArgs.ExpectedPoolStatus, connected)
69+
args.ExpectedPoolStatus, connected)
7570
}
7671

77-
poolInfo := checkArgs.ConnPool.GetInfo()
78-
for _, server := range checkArgs.Servers {
72+
poolInfo := args.ConnPool.GetInfo()
73+
for _, server := range args.Servers {
7974
status := poolInfo[server].ConnectedNow
80-
if checkArgs.ExpectedStatuses[server] != status {
75+
if args.ExpectedStatuses[server] != status {
8176
return fmt.Errorf(
8277
"incorrect conn status: addr %s expected status %t actual status %t",
83-
server, checkArgs.ExpectedStatuses[server], status)
78+
server, args.ExpectedStatuses[server], status)
8479
}
8580
}
8681

@@ -96,18 +91,13 @@ func CheckPoolStatuses(args interface{}) error {
9691
// ports or to all ports.
9792
// For PreferRW mode expected received ports equals to master ports
9893
// or to all ports.
99-
func ProcessListenOnInstance(args interface{}) error {
94+
func ProcessListenOnInstance(args ListenOnInstanceArgs) error {
10095
actualPorts := map[string]bool{}
10196

102-
listenArgs, ok := args.(ListenOnInstanceArgs)
103-
if !ok {
104-
return fmt.Errorf("incorrect args")
105-
}
106-
107-
for i := 0; i < listenArgs.ServersNumber; i++ {
97+
for i := 0; i < args.ServersNumber; i++ {
10898
req := tarantool.NewEvalRequest("return box.cfg.listen")
10999
var data []string
110-
err := listenArgs.ConnPool.Do(req, listenArgs.Mode).GetTyped(&data)
100+
err := args.ConnPool.Do(req, args.Mode).GetTyped(&data)
111101
if err != nil {
112102
return fmt.Errorf("failed to get response: %w", err)
113103
}
@@ -118,7 +108,7 @@ func ProcessListenOnInstance(args interface{}) error {
118108
actualPorts[data[0]] = true
119109
}
120110

121-
if err := comparePortMaps(listenArgs.ExpectedPorts, actualPorts); err != nil {
111+
if err := comparePortMaps(args.ExpectedPorts, actualPorts); err != nil {
122112
return err
123113
}
124114

0 commit comments

Comments
 (0)