Skip to content

Commit 8d792b3

Browse files
authored
Add Redis 8.6+ to CI/test setup (#962)
close #961 This PR adds a Redis 8.6+ service to the compose setup so tests that rely on newer Redis Streams behavior can run against it. Signed-off-by: jinbum-kim <jinbum9958@gmail.com>
1 parent ac424c8 commit 8d792b3

File tree

2 files changed

+29
-12
lines changed

2 files changed

+29
-12
lines changed

docker-compose.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ services:
3535
image: redis:5-alpine
3636
ports:
3737
- "6356:6379"
38+
compat860:
39+
image: redis:8.6.0-alpine
40+
ports:
41+
- "6382:6379"
3842
compat-redisearch:
3943
image: redis/redis-stack:7.4.0-v0
4044
ports:

rueidiscompat/adapter_test.go

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,20 @@ func TestAdapter(t *testing.T) {
5757
}
5858

5959
var (
60-
err error
61-
ctx context.Context
62-
clientresp2 rueidis.Client
63-
clientsearchresp2 rueidis.Client
64-
clusterresp2 rueidis.Client
65-
clientresp3 rueidis.Client
66-
clusterresp3 rueidis.Client
67-
adapterresp2 Cmdable
68-
adaptersearchresp2 Cmdable
69-
adaptercluster2 Cmdable
70-
adapterresp3 Cmdable
71-
adaptercluster3 Cmdable
60+
err error
61+
ctx context.Context
62+
clientresp2 rueidis.Client
63+
clientsearchresp2 rueidis.Client
64+
clusterresp2 rueidis.Client
65+
clientresp3 rueidis.Client
66+
clusterresp3 rueidis.Client
67+
clientresp3redis86 rueidis.Client
68+
adapterresp2 Cmdable
69+
adaptersearchresp2 Cmdable
70+
adaptercluster2 Cmdable
71+
adapterresp3 Cmdable
72+
adaptercluster3 Cmdable
73+
adapterresp3redis86 Cmdable
7274
)
7375

7476
var _ = BeforeSuite(func() {
@@ -85,6 +87,12 @@ var _ = BeforeSuite(func() {
8587
Expect(err).NotTo(HaveOccurred())
8688
adapterresp3 = NewAdapter(clientresp3)
8789
adaptercluster3 = NewAdapter(clusterresp3)
90+
clientresp3redis86, err = rueidis.NewClient(rueidis.ClientOption{
91+
InitAddress: []string{"127.0.0.1:6382"},
92+
ClientName: "rueidis",
93+
})
94+
Expect(err).NotTo(HaveOccurred())
95+
adapterresp3redis86 = NewAdapter(clientresp3redis86)
8896
clientresp2, err = rueidis.NewClient(rueidis.ClientOption{
8997
InitAddress: []string{"127.0.0.1:6356"},
9098
ClientName: "rueidis",
@@ -113,6 +121,11 @@ var _ = AfterSuite(func() {
113121
Expect(adapterresp3.FlushDB(ctx).Err()).NotTo(HaveOccurred())
114122
Expect(adapterresp3.Quit(ctx).Err()).NotTo(HaveOccurred())
115123
clientresp3.Close()
124+
125+
Expect(adapterresp3redis86.FlushDB(ctx).Err()).NotTo(HaveOccurred())
126+
Expect(adapterresp3redis86.Quit(ctx).Err()).NotTo(HaveOccurred())
127+
clientresp3redis86.Close()
128+
116129
Expect(adapterresp2.FlushDB(ctx).Err()).NotTo(HaveOccurred())
117130
Expect(adapterresp2.Quit(ctx).Err()).NotTo(HaveOccurred())
118131
clientresp2.Close()

0 commit comments

Comments
 (0)