Fix flaky test JedisPoolTest.testCloseConnectionOnMakeObject (#4138)

* Fix flaky test

* Using await as recommend

* Update ACLJedisPoolTest

* Missing perform request for connection

---------

Co-authored-by: ggivo <[email protected]>

Author: thachlp

src/test/java/redis/clients/jedis/ACLJedisPoolTest.java

@@ -1,12 +1,15 @@
 package redis.clients.jedis;
 
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.time.Duration;
 
 import io.redis.test.annotations.SinceRedisVersion;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
@@ -268,6 +271,8 @@ public void testCloseConnectionOnMakeObject() {
         pool.getResource();
         fail("Should throw exception as password is incorrect.");
       } catch (Exception e) {
+        await().pollDelay(Duration.ofMillis(10)).atMost(50, MILLISECONDS)
+            .until(() -> getClientCount(jedis.clientList()) == currentClientCount);
         assertEquals(currentClientCount, getClientCount(jedis.clientList()));
       }
     }

src/test/java/redis/clients/jedis/JedisPoolTest.java

@@ -1,5 +1,7 @@
 package redis.clients.jedis;
 
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
@@ -8,6 +10,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.time.Duration;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.commons.pool2.PooledObject;
 import org.apache.commons.pool2.PooledObjectFactory;
@@ -400,6 +403,8 @@ public void testCloseConnectionOnMakeObject() {
         pool.getResource();
         fail("Should throw exception as password is incorrect.");
       } catch (Exception e) {
+        await().pollDelay(Duration.ofMillis(10)).atMost(50, MILLISECONDS)
+            .until(() -> getClientCount(jedis.clientList()) == currentClientCount);
         assertEquals(currentClientCount, getClientCount(jedis.clientList()));
       }
     }