Merge branch 'master' into im/introduce-command-flags

uglide · web-flow · commit fdf00b55605b · 2025-11-05T10:06:58.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -188,7 +188,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5-fluent</artifactId>
-			<version>5.5</version>
+			<version>5.5.1</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/src/test/java/redis/clients/jedis/JedisPubSubBaseTest.java b/src/test/java/redis/clients/jedis/JedisPubSubBaseTest.java
@@ -55,6 +55,6 @@ protected String encode(byte[] raw) {
         });
         thread.start();
 
-        assertTrue(countDownLatch.await(10, TimeUnit.MILLISECONDS));
+        assertTrue(countDownLatch.await(30, TimeUnit.MILLISECONDS));
     }
 }
diff --git a/src/test/java/redis/clients/jedis/mcf/StatusTrackerTest.java b/src/test/java/redis/clients/jedis/mcf/StatusTrackerTest.java
@@ -4,6 +4,7 @@
 import static org.mockito.Mockito.*;
 import static org.awaitility.Awaitility.await;
 
+import java.time.Duration;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
@@ -71,11 +72,9 @@ void testWaitForHealthStatus_EventDriven() throws InterruptedException {
     });
     waitingThread.start();
 
-    // Give some time for the listener to be registered
-    Thread.sleep(50);
+    await().atMost(Duration.ofMillis(100L)).pollInterval(Duration.ofMillis(5L)).untilAsserted(
+      () -> assertNotNull(capturedListener[0], "Listener should have been registered"));
 
-    // Simulate health status change event
-    assertNotNull(capturedListener[0], "Listener should have been registered");
     HealthStatusChangeEvent event = new HealthStatusChangeEvent(testEndpoint, HealthStatus.UNKNOWN,
         HealthStatus.HEALTHY);
     capturedListener[0].onStatusChange(event);

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,6 @@ protected String encode(byte[] raw) {`
`55`	`55`	`});`
`56`	`56`	`thread.start();`
`57`	`57`
`58`		`- assertTrue(countDownLatch.await(10, TimeUnit.MILLISECONDS));`
	`58`	`+ assertTrue(countDownLatch.await(30, TimeUnit.MILLISECONDS));`
`59`	`59`	`}`
`60`	`60`	`}`