Skip to content

Commit 759a726

Browse files
ggivoa-TODO-rov
andauthored
bump test image to 8.2.2 (#3460)
* verify 8.2.2-pre * Fix integration tests * Bump to official version --------- Co-authored-by: aleksandar.todorov <[email protected]>
1 parent e779ada commit 759a726

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,9 @@ void xgroupCreate() {
407407

408408
@Test
409409
@EnabledOnCommand("EVAL_RO") // Redis 7.0
410-
void xgroupCreateEntriesRead() {
410+
void xgroupCreateEntriesRead_pre822() {
411+
assumeTrue(RedisConditions.of(redis).getRedisVersion().isLessThan(RedisConditions.Version.parse("8.2.2")),
412+
"Redis 8.2.2+ has different behavior for entries-read");
411413

412414
redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.entriesRead(5).mkstream(true));
413415

@@ -416,6 +418,21 @@ void xgroupCreateEntriesRead() {
416418
assertThat(group.get(0)).containsSequence("entries-read", 5L, "lag");
417419
}
418420

421+
@Test
422+
@EnabledOnCommand("EVAL_RO") // Redis 7.0
423+
void xgroupCreateEntriesRead_post822() {
424+
assumeTrue(RedisConditions.of(redis).hasVersionGreaterOrEqualsTo("8.2.2"),
425+
"Redis 8.2.2+ has different behavior for entries-read");
426+
427+
redis.xadd(key, Collections.singletonMap("key", "value"));
428+
redis.xadd(key, Collections.singletonMap("key", "value"));
429+
redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.entriesRead(5).mkstream(true));
430+
431+
List<List<Object>> group = (List) redis.xinfoGroups("key");
432+
433+
assertThat(group.get(0)).containsSequence("entries-read", 2L, "lag");
434+
}
435+
419436
@Test
420437
@EnabledOnCommand("XAUTOCLAIM") // Redis 6.2
421438
void xgroupCreateconsumer() {

src/test/resources/docker-env/.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
REDIS_ENV_WORK_DIR=../../../../work/docker
2-
REDIS_VERSION=8.2.1-pre
3-
REDIS_STACK_VERSION=8.2.1-pre
2+
REDIS_VERSION=8.2.2
3+
REDIS_STACK_VERSION=8.2.2

src/test/resources/docker-env/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
x-client-libs-image: &client-libs-image
2-
image: "redislabs/client-libs-test:${REDIS_VERSION:-8.2.1pre}"
2+
image: "redislabs/client-libs-test:${REDIS_VERSION:-8.2.2}"
33
x-client-libs-stack-image: &client-libs-stack-image
4-
image: "redislabs/client-libs-test:${REDIS_STACK_VERSION:-8.2.1-pre}"
4+
image: "redislabs/client-libs-test:${REDIS_STACK_VERSION:-8.2.2}"
55

66
services:
77
# Standalone Redis Servers

0 commit comments

Comments
 (0)