Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix flaky testTcpCloseNoDemand test 

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
Ludovic Orban 2023-11-20 17:15:05 +01:00
parent 3d03339d43
commit 59a7bc1575
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-core/jetty-websocket/jetty-websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java
View File

@ -43,6 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
/**
* Tests of a core server with a fake client
@ -247,8 +248,9 @@ public class WebSocketServerTest extends WebSocketTester
public void onFrame(Frame frame, Callback callback)
{
LOG.info("onFrame: " + BufferUtil.toDetailString(frame.getPayload()));
receivedFrames.offer(frame);
// Update receivedCallbacks first as its size is asserted right after receivedFrames is polled.
receivedCallbacks.offer(callback);
receivedFrames.offer(frame);
}
@Override
@ -269,14 +271,15 @@ public class WebSocketServerTest extends WebSocketTester
BufferUtil.append(buffer, RawFrameBuilder.buildText("World", true), 0, 6 + 5);
client.getOutputStream().write(BufferUtil.toArray(buffer));
long start = NanoTime.now();
// Make sure serverHandler got called before moving on.
await().atMost(10, TimeUnit.SECONDS).until(() -> serverHandler.getCoreSession() != null);
for (int i = 0; i < 3; i++)
{
serverHandler.getCoreSession().demand();
Frame frame = serverHandler.receivedFrames.poll(5, TimeUnit.SECONDS);
assertNotNull(frame);
}
assertThat(NanoTime.secondsSince(start), Matchers.lessThan(10L));
assertThat(receivedCallbacks.size(), is(3));
client.close();