Skip to content

Commit f19f65b

Browse files
committed
try to enable osscluster tests
1 parent 28138dd commit f19f65b

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

.github/actions/run-tests/action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ runs:
3838
if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
3939
echo "REDIS_IMAGE=redis:${{ inputs.redis-version }}" >> $GITHUB_ENV
4040
echo "CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test:${redis_version_mapping[$REDIS_VERSION]}" >> $GITHUB_ENV
41-
echo "REDIS_MOD_URL=redis://127.0.0.1:6479/0" >> $GITHUB_ENV
4241
else
4342
echo "Version not found in the mapping."
4443
exit 1
@@ -56,7 +55,6 @@ runs:
5655
go test \
5756
--ginkgo.skip-file="ring_test.go" \
5857
--ginkgo.skip-file="sentinel_test.go" \
59-
--ginkgo.skip-file="osscluster_test.go" \
6058
--ginkgo.skip-file="pubsub_test.go" \
6159
--ginkgo.skip-file="gears_commands_test.go" \
6260
--ginkgo.label-filter='!NonRedisEnterprise'

bench_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ func BenchmarkXRead(b *testing.B) {
277277

278278
func newClusterScenario() *clusterScenario {
279279
return &clusterScenario{
280-
ports: []string{"8220", "8221", "8222", "8223", "8224", "8225"},
280+
ports: []string{"16379", "16380", "16381", "16382", "16383", "16384"},
281281
nodeIDs: make([]string, 6),
282282
processes: make(map[string]*redisProcess, 6),
283283
clients: make(map[string]*redis.Client, 6),

main_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const (
2828
)
2929

3030
const (
31-
sentinelName = "mymaster"
31+
sentinelName = "go-redis-test"
3232
sentinelMasterPort = "9123"
3333
sentinelSlave1Port = "9124"
3434
sentinelSlave2Port = "9125"
@@ -59,7 +59,7 @@ var (
5959
)
6060

6161
var cluster = &clusterScenario{
62-
ports: []string{"8220", "8221", "8222", "8223", "8224", "8225"},
62+
ports: []string{"16379", "16380", "16381", "16382", "16383", "16384"},
6363
nodeIDs: make([]string, 6),
6464
processes: make(map[string]*redisProcess, 6),
6565
clients: make(map[string]*redis.Client, 6),

osscluster_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,30 +160,30 @@ func startCluster(ctx context.Context, scenario *clusterScenario) error {
160160
End: 4999,
161161
Nodes: []redis.ClusterNode{{
162162
ID: "",
163-
Addr: "127.0.0.1:8220",
163+
Addr: "127.0.0.1:16379",
164164
}, {
165165
ID: "",
166-
Addr: "127.0.0.1:8223",
166+
Addr: "127.0.0.1:16382",
167167
}},
168168
}, {
169169
Start: 5000,
170170
End: 9999,
171171
Nodes: []redis.ClusterNode{{
172172
ID: "",
173-
Addr: "127.0.0.1:8221",
173+
Addr: "127.0.0.1:16380",
174174
}, {
175175
ID: "",
176-
Addr: "127.0.0.1:8224",
176+
Addr: "127.0.0.1:16383",
177177
}},
178178
}, {
179179
Start: 10000,
180180
End: 16383,
181181
Nodes: []redis.ClusterNode{{
182182
ID: "",
183-
Addr: "127.0.0.1:8222",
183+
Addr: "127.0.0.1:16381",
184184
}, {
185185
ID: "",
186-
Addr: "127.0.0.1:8225",
186+
Addr: "127.0.0.1:16384",
187187
}},
188188
}}
189189
for _, client := range scenario.clients {

0 commit comments

Comments
 (0)