Attempt to make the subscribeToShardChannelViaOtherEndpointa and pubS…

…ubSsl more stable
redis · Apr 11, 2024 · c4623b0 · c4623b0
1 parent 764fdf3
commit c4623b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/test/java/io/lettuce/core/SslIntegrationTests.java b/src/test/java/io/lettuce/core/SslIntegrationTests.java
@@ -383,14 +383,13 @@ void pubSubSsl() {
         RedisPubSubCommands<String, String> connection = redisClient.connectPubSub(URI_NO_VERIFY).sync();
         connection.subscribe("c1");
         connection.subscribe("c2");
-        Delay.delay(Duration.ofMillis(200));
 
         RedisPubSubCommands<String, String> connection2 = redisClient.connectPubSub(URI_NO_VERIFY).sync();
 
-        assertThat(connection2.pubsubChannels()).contains("c1", "c2");
+        Wait.untilTrue(()->connection2.pubsubChannels().contains("c1")).waitOrTimeout();
+        Wait.untilTrue(()->connection2.pubsubChannels().contains("c2")).waitOrTimeout();
         connection.quit();
-        Delay.delay(Duration.ofMillis(200));
-        Wait.untilTrue(connection::isOpen).waitOrTimeout();
+        Wait.untilTrue(connection.getStatefulConnection()::isOpen).waitOrTimeout();
         Wait.untilEquals(2, () -> connection2.pubsubChannels().size()).waitOrTimeout();
 
         assertThat(connection2.pubsubChannels()).contains("c1", "c2");

diff --git a/...est/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java b/...est/java/io/lettuce/core/cluster/pubsub/RedisClusterPubSubConnectionIntegrationTests.java
@@ -120,7 +120,7 @@ void testRegularClientPubSubShardChannels() {
     void subscribeToShardChannel() throws Exception {
         pubSubConnection.addListener(connectionListener);
         pubSubConnection.async().ssubscribe(shardChannel);
-        assertThat(connectionListener.getChannels().poll(3, TimeUnit.SECONDS)).isEqualTo(shardChannel);
+        assertThat(connectionListener.getChannels().take()).isEqualTo(shardChannel);
     }
 
     @Test
@@ -132,7 +132,7 @@ void subscribeToShardChannelViaOtherEndpoint() throws Exception {
         RedisPubSubAsyncCommands<String, String> other = pubSub
                 .nodes(node -> node.getRole().isUpstream() && !node.getNodeId().equals(nodeId)).commands(0);
         other.ssubscribe(shardChannel);
-        assertThat(connectionListener.getChannels().poll(3, TimeUnit.SECONDS)).isEqualTo(shardChannel);
+        assertThat(connectionListener.getChannels().take()).isEqualTo(shardChannel);
     }
 
     @Test