Skip to content

Update test infra to use latest Redis #4179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ start: cleanup compile-module
echo "$$REDIS_UDS" | redis-server -
echo "$$REDIS_UNAVAILABLE_CONF" | redis-server -
redis-cli -a cluster --cluster create 127.0.0.1:7479 127.0.0.1:7480 127.0.0.1:7481 --cluster-yes
docker run -p 6479:6379 --name jedis-stack -e PORT=6379 -d redislabs/client-libs-test:8.0-M04-pre
docker run -p 6479:6379 --name jedis-stack -e PORT=6379 -d redislabs/client-libs-test:8.0.2

cleanup:
- rm -vf /tmp/redis_cluster_node*.conf 2>/dev/null
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/redis/clients/jedis/ACLJedisPoolTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public void testCloseConnectionOnMakeObject() {
int currentClientCount = getClientCount(jedis.clientList());
assertThrows(JedisAccessControlException.class, pool::getResource);
// wait for the redis server to close the connection
await().pollDelay(Duration.ofMillis(10)).atMost(50, MILLISECONDS)
await().pollDelay(Duration.ofMillis(10)).atMost(500, MILLISECONDS)
.until(() -> getClientCount(jedis.clientList()) == currentClientCount);
assertEquals(currentClientCount, getClientCount(jedis.clientList()));
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/redis/clients/jedis/JedisPoolTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ public void testCloseConnectionOnMakeObject() {
int currentClientCount = getClientCount(jedis.clientList());
assertThrows(JedisAccessControlException.class, pool::getResource);
// wait for the redis server to close the connection
await().pollDelay(Duration.ofMillis(10)).atMost(50, MILLISECONDS)
await().pollDelay(Duration.ofMillis(10)).atMost(500, MILLISECONDS)
.until(() -> getClientCount(jedis.clientList()) == currentClientCount);
assertEquals(currentClientCount, getClientCount(jedis.clientList()));
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/env/.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
REDIS_VERSION=8.0-RC2-pre
REDIS_STACK_VERSION=8.0-RC2-pre
REDIS_VERSION=8.0.2
REDIS_STACK_VERSION=8.0.2
CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test
REDIS_ENV_CONF_DIR=./
REDIS_MODULES_DIR=/tmp
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/env/.env.v7.2
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
REDIS_VERSION=7.2.7
REDIS_STACK_VERSION=rs-7.2.0-v15
REDIS_VERSION=7.2.9
REDIS_STACK_VERSION=rs-7.2.0-v17
4 changes: 2 additions & 2 deletions src/test/resources/env/.env.v7.4
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
REDIS_VERSION=7.4.2
REDIS_STACK_VERSION=rs-7.4.0-v2
REDIS_VERSION=7.4.4
REDIS_STACK_VERSION=rs-7.4.0-v5
Loading