From f96523402e157f3b26382af50512be7fe7d7886b Mon Sep 17 00:00:00 2001 From: ggivo Date: Tue, 19 Nov 2024 17:25:03 +0200 Subject: [PATCH] Mark SSL & ACL test's since 7.0 In 6.2.16 CLUSTER slots command returns the non-tls port when contacted by tls one. Tests need to be revisited to make them compatible with 6.2.x --- src/test/java/redis/clients/jedis/SSLACLJedisClusterTest.java | 3 +-- src/test/java/redis/clients/jedis/SSLJedisClusterTest.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/java/redis/clients/jedis/SSLACLJedisClusterTest.java b/src/test/java/redis/clients/jedis/SSLACLJedisClusterTest.java index 7851d563b1..0772ede767 100644 --- a/src/test/java/redis/clients/jedis/SSLACLJedisClusterTest.java +++ b/src/test/java/redis/clients/jedis/SSLACLJedisClusterTest.java @@ -17,7 +17,7 @@ import redis.clients.jedis.exceptions.JedisClusterOperationException; -@SinceRedisVersion("6.0.0") +@SinceRedisVersion(value = "7.0.0", message = "Redis 6.2.x returns non-tls port in CLUSTER SLOTS command. Enable for 6.2.x after tests are fixed.") public class SSLACLJedisClusterTest extends JedisClusterTestBase { private static final int DEFAULT_REDIRECTIONS = 5; @@ -54,7 +54,6 @@ public static void prepare() { } @Test - @SinceRedisVersion(value = "7.0.0", message = "Redis 6.2.x returns non-tls port in CLUSTER SLOTS command. Enable for 6.2.x after test is fixed.") public void testSSLDiscoverNodesAutomatically() { DefaultJedisClientConfig config = DefaultJedisClientConfig.builder() .user("default") diff --git a/src/test/java/redis/clients/jedis/SSLJedisClusterTest.java b/src/test/java/redis/clients/jedis/SSLJedisClusterTest.java index cf5b541da2..7465881c15 100644 --- a/src/test/java/redis/clients/jedis/SSLJedisClusterTest.java +++ b/src/test/java/redis/clients/jedis/SSLJedisClusterTest.java @@ -19,6 +19,7 @@ import redis.clients.jedis.exceptions.JedisClusterOperationException; +@SinceRedisVersion(value = "7.0.0", message = "Redis 6.2.x returns non-tls port in CLUSTER SLOTS command. Enable for 6.2.x after test is fixed.") public class SSLJedisClusterTest extends JedisClusterTestBase { private static final int DEFAULT_REDIRECTIONS = 5; @@ -47,7 +48,6 @@ public static void prepare() { } @Test - @SinceRedisVersion(value = "7.0.0", message = "Redis 6.2.x returns non-tls port in CLUSTER SLOTS command. Enable for 6.2.x after test is fixed.") public void testSSLDiscoverNodesAutomatically() { try (JedisCluster jc = new JedisCluster(Collections.singleton(new HostAndPort("localhost", 8379)), DefaultJedisClientConfig.builder().password("cluster") @@ -115,7 +115,6 @@ public void testSSLWithoutPortMap() { } @Test - @SinceRedisVersion(value = "7.0.0", message = "Redis 6.2.x returns non-tls port in CLUSTER SLOTS command. Enable for 6.2.x after test is fixed.") public void connectByIpAddress() { try (JedisCluster jc = new JedisCluster(new HostAndPort("127.0.0.1", 8379), DefaultJedisClientConfig.builder()