#10226 - assert using awaitility

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
jetty · Aug 24, 2023 · 10b7fcd · 10b7fcd
1 parent 092ce60
commit 10b7fcd
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/...client-transports/src/test/java/org/eclipse/jetty/test/client/transport/AbstractTest.java b/...client-transports/src/test/java/org/eclipse/jetty/test/client/transport/AbstractTest.java
@@ -21,7 +21,9 @@
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
+import org.awaitility.Awaitility;
 import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.HttpClientTransport;
@@ -63,8 +65,8 @@
 import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class AbstractTest
 {
@@ -116,9 +118,27 @@ public void dispose()
         try
         {
             if (serverBufferPool != null)
-                assertThat("Server Leaks: " + serverBufferPool.dumpLeaks(), serverBufferPool.getLeaks().size(), Matchers.is(0));
+            {
+                try
+                {
+                    Awaitility.await().atMost(3, TimeUnit.SECONDS).until(() -> serverBufferPool.getLeaks().size(), Matchers.is(0));
+                }
+                catch (Exception e)
+                {
+                    fail(e.getMessage() + "\n---\nServer Leaks: " + serverBufferPool.dumpLeaks() + "---\n");
+                }
+            }
             if (clientBufferPool != null)
-                assertThat("Client Leaks: " + clientBufferPool.dumpLeaks(), clientBufferPool.getLeaks().size(), Matchers.is(0));
+            {
+                try
+                {
+                    Awaitility.await().atMost(3, TimeUnit.SECONDS).until(() -> clientBufferPool.getLeaks().size(), Matchers.is(0));
+                }
+                catch (Exception e)
+                {
+                    fail(e.getMessage() + "\n---\nClient Leaks: " + clientBufferPool.dumpLeaks() + "---\n");
+                }
+            }
         }
         finally
         {