|
51 | 51 |
|
52 | 52 | processes map[string]*redisProcess
|
53 | 53 |
|
54 |
| - redisMain *redisProcess |
55 |
| - ringShard1, ringShard2, ringShard3 *redisProcess |
| 54 | + ringShard1, ringShard2, ringShard3 *redis.Client |
56 | 55 | sentinelMaster, sentinelSlave1, sentinelSlave2 *redisProcess
|
57 | 56 | sentinel1, sentinel2, sentinel3 *redisProcess
|
58 | 57 | )
|
@@ -120,18 +119,6 @@ var _ = BeforeSuite(func() {
|
120 | 119 |
|
121 | 120 | if !RECluster && !RCEDocker {
|
122 | 121 |
|
123 |
| - redisMain, err = startRedis(redisPort) |
124 |
| - Expect(err).NotTo(HaveOccurred()) |
125 |
| - |
126 |
| - ringShard1, err = startRedis(ringShard1Port) |
127 |
| - Expect(err).NotTo(HaveOccurred()) |
128 |
| - |
129 |
| - ringShard2, err = startRedis(ringShard2Port) |
130 |
| - Expect(err).NotTo(HaveOccurred()) |
131 |
| - |
132 |
| - ringShard3, err = startRedis(ringShard3Port) |
133 |
| - Expect(err).NotTo(HaveOccurred()) |
134 |
| - |
135 | 122 | sentinelMaster, err = startRedis(sentinelMasterPort)
|
136 | 123 | Expect(err).NotTo(HaveOccurred())
|
137 | 124 |
|
@@ -159,6 +146,15 @@ var _ = BeforeSuite(func() {
|
159 | 146 | redisAddr = redisStackAddr
|
160 | 147 |
|
161 | 148 | if !RECluster {
|
| 149 | + ringShard1, err = connectTo(ringShard1Port) |
| 150 | + Expect(err).NotTo(HaveOccurred()) |
| 151 | + |
| 152 | + ringShard2, err = connectTo(ringShard2Port) |
| 153 | + Expect(err).NotTo(HaveOccurred()) |
| 154 | + |
| 155 | + ringShard3, err = connectTo(ringShard3Port) |
| 156 | + Expect(err).NotTo(HaveOccurred()) |
| 157 | + |
162 | 158 | // populate cluster node information
|
163 | 159 | Expect(configureClusterTopology(ctx, cluster)).NotTo(HaveOccurred())
|
164 | 160 | }
|
|
0 commit comments