Skip to content

Commit 7697b6a

Browse files
authored
Minor fix with Token-Based-Authentication integration tests (#4044)
- set endpoint for entraid cluster intg tests - enable networkpartition tests
1 parent d4a569c commit 7697b6a

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

src/test/java/redis/clients/jedis/authentication/RedisEntraIDIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ public void connectionAuthWithExpiredTokenTest() {
323323

324324
// T.3.4
325325
// Verify handling of reconnection and re-authentication after a network partition. (use cached token)
326-
// @Test
326+
@Test
327327
public void networkPartitionEvictionTest() {
328328
TokenAuthConfig tokenAuthConfig = EntraIDTokenAuthConfigBuilder.builder()
329329
.clientId(testCtx.getClientId()).secret(testCtx.getClientSecret())

src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationClusterIntegrationTests.java

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
import java.util.concurrent.Executors;
2020
import java.util.concurrent.Future;
2121

22+
import org.junit.BeforeClass;
2223
import org.junit.Test;
24+
import org.slf4j.Logger;
25+
import org.slf4j.LoggerFactory;
2326

2427
import redis.clients.authentication.core.IdentityProvider;
2528
import redis.clients.authentication.core.IdentityProviderConfig;
@@ -29,13 +32,29 @@
2932
import redis.clients.jedis.Connection;
3033
import redis.clients.jedis.ConnectionPoolConfig;
3134
import redis.clients.jedis.DefaultJedisClientConfig;
35+
import redis.clients.jedis.EndpointConfig;
3236
import redis.clients.jedis.HostAndPort;
3337
import redis.clients.jedis.HostAndPorts;
3438
import redis.clients.jedis.JedisClientConfig;
3539
import redis.clients.jedis.JedisCluster;
36-
import redis.clients.jedis.JedisClusterTestBase;
3740

38-
public class TokenBasedAuthenticationClusterIntegrationTests extends JedisClusterTestBase {
41+
public class TokenBasedAuthenticationClusterIntegrationTests {
42+
private static final Logger log = LoggerFactory
43+
.getLogger(TokenBasedAuthenticationClusterIntegrationTests.class);
44+
45+
private static EndpointConfig endpointConfig;
46+
private static HostAndPort hnp;
47+
48+
@BeforeClass
49+
public static void before() {
50+
try {
51+
endpointConfig = HostAndPorts.getRedisEndpoint("cluster-entraid-acl");
52+
hnp = endpointConfig.getHostAndPort();
53+
} catch (IllegalArgumentException e) {
54+
log.warn("Skipping test because no Redis endpoint is configured");
55+
org.junit.Assume.assumeTrue(false);
56+
}
57+
}
3958

4059
@Test
4160
public void testClusterInitWithAuthXManager() {
@@ -55,12 +74,11 @@ public Token requestToken() {
5574
AuthXManager manager = new AuthXManager(EntraIDTokenAuthConfigBuilder.builder()
5675
.lowerRefreshBoundMillis(1000).identityProviderConfig(idpConfig).build());
5776

58-
HostAndPort hp = HostAndPorts.getClusterServers().get(0);
5977
int defaultDirections = 5;
6078
JedisClientConfig config = DefaultJedisClientConfig.builder().authXManager(manager).build();
6179

6280
ConnectionPoolConfig DEFAULT_POOL_CONFIG = new ConnectionPoolConfig();
63-
try (JedisCluster jc = new JedisCluster(hp, config, defaultDirections,
81+
try (JedisCluster jc = new JedisCluster(hnp, config, defaultDirections,
6482
DEFAULT_POOL_CONFIG)) {
6583

6684
assertEquals("OK", jc.set("foo", "bar"));
@@ -98,13 +116,12 @@ public Token requestToken() {
98116
return result;
99117
}).when(authXManager).addConnection(any(Connection.class));
100118

101-
HostAndPort hp = HostAndPorts.getClusterServers().get(0);
102119
JedisClientConfig config = DefaultJedisClientConfig.builder().authXManager(authXManager)
103120
.build();
104121

105122
ExecutorService executorService = Executors.newFixedThreadPool(2);
106123
CountDownLatch latch = new CountDownLatch(1);
107-
try (JedisCluster jc = new JedisCluster(Collections.singleton(hp), config)) {
124+
try (JedisCluster jc = new JedisCluster(Collections.singleton(hnp), config)) {
108125
Runnable task = () -> {
109126
while (latch.getCount() > 0) {
110127
assertEquals("OK", jc.set("foo", "bar"));

0 commit comments

Comments
 (0)