From 7c757689a2f429ad8aef986c13c6278388e8493b Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 6 Dec 2022 15:48:36 +0100 Subject: [PATCH] Fixes #9009 - Flaky test StreamCloseTest.testRequestDataClosedResponseDataClosedClosesStream. Regression introduced by #8678. Now using awaitility to wait for the stream count to go to zero. Signed-off-by: Simone Bordet --- .../java/org/eclipse/jetty/http2/client/StreamCloseTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamCloseTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamCloseTest.java index 5dc0beb00c9..1cd02492f09 100644 --- a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamCloseTest.java +++ b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamCloseTest.java @@ -14,6 +14,7 @@ package org.eclipse.jetty.http2.client; import java.nio.ByteBuffer; +import java.time.Duration; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -38,6 +39,8 @@ import org.eclipse.jetty.util.FuturePromise; import org.eclipse.jetty.util.Promise; import org.junit.jupiter.api.Test; +import static org.awaitility.Awaitility.await; +import static org.hamcrest.Matchers.equalTo; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -179,7 +182,7 @@ public class StreamCloseTest extends AbstractTest assertTrue(serverDataLatch.await(5, TimeUnit.SECONDS)); assertTrue(completeLatch.await(5, TimeUnit.SECONDS)); assertTrue(stream.isClosed()); - assertEquals(0, stream.getSession().getStreams().size()); + await().atMost(Duration.ofSeconds(5)).until(() -> stream.getSession().getStreams().size(), equalTo(0)); } @Test