Refactor test utilities and remove time import

Author: bootjp

adapter/redis_test.go

@@ -3,7 +3,6 @@ package adapter
 import (
 	"context"
 	"testing"
-	"time"
 
 	"github.com/redis/go-redis/v9"
 	"github.com/stretchr/testify/assert"
@@ -68,10 +67,9 @@ func TestRedis_follower_redirect_node_set_get_deleted(t *testing.T) {
 	assert.NoError(t, res3.Err())
 	assert.Equal(t, int64(1), res3.Val())
 
-	assert.Eventually(t, func() bool {
-		res4 := rdb.Get(ctx, string(key))
-		return res4.Err() == redis.Nil && res4.Val() == ""
-	}, 2*time.Second, 50*time.Millisecond)
+	res4 := rdb.Get(ctx, string(key))
+	assert.Equal(t, redis.Nil, res4.Err())
+	assert.Equal(t, "", res4.Val())
 }
 
 func TestRedis_leader_keys(t *testing.T) {

adapter/test_util.go

@@ -108,43 +108,105 @@ func newNode(grpcAddress, raftAddress, redisAddress string, r *raft.Raft, tm *tr
 
 //nolint:unparam
 func createNode(t *testing.T, n int) ([]Node, []string, []string) {
-	var grpcAdders []string
-	var redisAdders []string
-	var nodes []Node
-
 	const (
 		waitTimeout  = 5 * time.Second
 		waitInterval = 100 * time.Millisecond
 	)
 
-	cfg := raft.Configuration{}
-	ports := make([]portsAdress, n)
+	t.Helper()
 
 	ctx := context.Background()
-	var lc net.ListenConfig
 
-	// port assign
+	ports := assignPorts(n)
+	cfg := buildRaftConfig(n, ports)
+	nodes, grpcAdders, redisAdders := setupNodes(t, ctx, n, ports, cfg)
+
+	waitForNodeListeners(t, ctx, nodes, waitTimeout, waitInterval)
+	waitForRaftReadiness(t, nodes, waitTimeout, waitInterval)
+
+	return nodes, grpcAdders, redisAdders
+}
+
+func waitForNodeListeners(t *testing.T, ctx context.Context, nodes []Node, waitTimeout, waitInterval time.Duration) {
+	t.Helper()
+	d := &net.Dialer{Timeout: time.Second}
+	for _, n := range nodes {
+		assert.Eventually(t, func() bool {
+			conn, err := d.DialContext(ctx, "tcp", n.grpcAddress)
+			if err != nil {
+				return false
+			}
+			_ = conn.Close()
+			conn, err = d.DialContext(ctx, "tcp", n.redisAddress)
+			if err != nil {
+				return false
+			}
+			_ = conn.Close()
+			return true
+		}, waitTimeout, waitInterval)
+	}
+}
+
+func waitForRaftReadiness(t *testing.T, nodes []Node, waitTimeout, waitInterval time.Duration) {
+	t.Helper()
+	assert.Eventually(t, func() bool {
+		return nodes[0].raft.State() == raft.Leader
+	}, waitTimeout, waitInterval)
+
+	expectedLeader := raft.ServerAddress(nodes[0].raftAddress)
+	assert.Eventually(t, func() bool {
+		for i, n := range nodes {
+			state := n.raft.State()
+			if i == 0 {
+				if state != raft.Leader {
+					return false
+				}
+			} else if state != raft.Follower {
+				return false
+			}
+
+			addr, _ := n.raft.LeaderWithID()
+			if addr != expectedLeader {
+				return false
+			}
+		}
+		return true
+	}, waitTimeout, waitInterval)
+}
+
+func assignPorts(n int) []portsAdress {
+	ports := make([]portsAdress, n)
 	for i := 0; i < n; i++ {
 		ports[i] = portAssigner()
 	}
+	return ports
+}
 
-	// build raft node config
+func buildRaftConfig(n int, ports []portsAdress) raft.Configuration {
+	cfg := raft.Configuration{}
 	for i := 0; i < n; i++ {
-		var suffrage raft.ServerSuffrage
+		suffrage := raft.Nonvoter
 		if i == 0 {
 			suffrage = raft.Voter
-		} else {
-			suffrage = raft.Nonvoter
 		}
 
-		server := raft.Server{
+		cfg.Servers = append(cfg.Servers, raft.Server{
 			Suffrage: suffrage,
 			ID:       raft.ServerID(strconv.Itoa(i)),
 			Address:  raft.ServerAddress(ports[i].raftAddress),
-		}
-		cfg.Servers = append(cfg.Servers, server)
+		})
 	}
 
+	return cfg
+}
+
+func setupNodes(t *testing.T, ctx context.Context, n int, ports []portsAdress, cfg raft.Configuration) ([]Node, []string, []string) {
+	t.Helper()
+	var grpcAdders []string
+	var redisAdders []string
+	var nodes []Node
+	var lc net.ListenConfig
+
 	for i := 0; i < n; i++ {
 		st := store.NewRbMemoryStore()
 		trxSt := store.NewMemoryStoreDefaultTTL()
@@ -172,16 +234,16 @@ func createNode(t *testing.T, n int) ([]Node, []string, []string) {
 
 		grpcAdders = append(grpcAdders, port.grpcAddress)
 		redisAdders = append(redisAdders, port.redisAddress)
-		go func() {
-			assert.NoError(t, s.Serve(grpcSock))
-		}()
+		go func(srv *grpc.Server, lis net.Listener) {
+			assert.NoError(t, srv.Serve(lis))
+		}(s, grpcSock)
 
 		l, err := lc.Listen(ctx, "tcp", port.redisAddress)
 		assert.NoError(t, err)
 		rd := NewRedisServer(l, st, coordinator)
-		go func() {
-			assert.NoError(t, rd.Run())
-		}()
+		go func(server *RedisServer) {
+			assert.NoError(t, server.Run())
+		}(rd)
 
 		nodes = append(nodes, newNode(
 			port.grpcAddress,
@@ -192,30 +254,8 @@ func createNode(t *testing.T, n int) ([]Node, []string, []string) {
 			s,
 			rd,
 		))
-
-	}
-
-	d := &net.Dialer{Timeout: time.Second}
-	for _, n := range nodes {
-		assert.Eventually(t, func() bool {
-			conn, err := d.DialContext(ctx, "tcp", n.grpcAddress)
-			if err != nil {
-				return false
-			}
-			_ = conn.Close()
-			conn, err = d.DialContext(ctx, "tcp", n.redisAddress)
-			if err != nil {
-				return false
-			}
-			_ = conn.Close()
-			return true
-		}, waitTimeout, waitInterval)
 	}
 
-	assert.Eventually(t, func() bool {
-		return nodes[0].raft.State() == raft.Leader
-	}, waitTimeout, waitInterval)
-
 	return nodes, grpcAdders, redisAdders
 }