Update test

Author: arturobernalg

httpcore5/src/test/java/org/apache/hc/core5/pool/TestStrictConnPoolLeaseTimeoutRace.java

@@ -32,9 +32,9 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
@@ -115,6 +115,7 @@ void testLeaseTimeoutDoesNotLeakLeasedEntries(final PoolCase poolCase) throws Ex
         final AtomicLong n = new AtomicLong(concurrentThreads * 100);
 
         final ExecutorService executorService = Executors.newFixedThreadPool(concurrentThreads);
+        final AtomicReference<Exception> unexpectedException = new AtomicReference<>();
         try {
             for (int i = 0; i < concurrentThreads; i++) {
                 executorService.execute(() -> {
@@ -127,9 +128,14 @@ void testLeaseTimeoutDoesNotLeakLeasedEntries(final PoolCase poolCase) throws Ex
                                 pool.release(entry, true);
                             } catch (final InterruptedException ex) {
                                 Thread.currentThread().interrupt();
-                                Assertions.fail("Unexpected exception", ex);
-                            } catch (final TimeoutException | ExecutionException ignored) {
+                                unexpectedException.compareAndSet(null, ex);
+                            } catch (final TimeoutException ex) {
                                 f.cancel(true);
+                            } catch (final ExecutionException ex) {
+                                f.cancel(true);
+                                if (!(ex.getCause() instanceof TimeoutException)) {
+                                    unexpectedException.compareAndSet(null, ex);
+                                }
                             }
                         }
                     } finally {
@@ -140,13 +146,14 @@ void testLeaseTimeoutDoesNotLeakLeasedEntries(final PoolCase poolCase) throws Ex
 
             Assertions.assertTrue(countDownLatch.await(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit()));
             Assertions.assertTrue(n.get() <= 0);
+            Assertions.assertNull(unexpectedException.get());
 
             final PoolStats stats = pool.getStats(route);
             Assertions.assertEquals(0, stats.getLeased());
 
         } finally {
             executorService.shutdownNow();
-            executorService.awaitTermination(5, TimeUnit.SECONDS);
+            executorService.awaitTermination(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
             pool.close(CloseMode.GRACEFUL);
         }
     }