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

minor cleanups a potential flaky fix

This commit is contained in:
gregw 2024-09-02 08:23:28 +10:00
parent ebc5e559f8
commit 3d5a58a1f4
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/LargeHeaderTest.java
View File

@ -48,6 +48,7 @@ import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class LargeHeaderTest public class LargeHeaderTest
{ {
@ -79,7 +80,7 @@ public class LargeHeaderTest
} }
@Override @Override
public boolean handle(Request request, Response response, Callback callback) throws Exception public boolean handle(Request request, Response response, Callback callback)
{ {
String idCount = request.getHeaders().get("X-Count"); String idCount = request.getHeaders().get("X-Count");
LOG.debug("X-Count: {} [handle]", idCount); LOG.debug("X-Count: {} [handle]", idCount);
@ -245,8 +246,11 @@ public class LargeHeaderTest
throw issues; throw issues;
} }
for (Future<Void> future : futures)
future.get(2, TimeUnit.SECONDS);
executorService.shutdown(); executorService.shutdown();
executorService.awaitTermination(timeout * 2, TimeUnit.SECONDS); assertTrue(executorService.awaitTermination(timeout * 2, TimeUnit.SECONDS));
assertEquals(iterations, count500.get(), () -> assertEquals(iterations, count500.get(), () ->
{ {
return """ return """
@ -297,12 +301,7 @@ public class LargeHeaderTest
} }
HttpTester.Response response = HttpTester.parseResponse(rawResponse); HttpTester.Response response = HttpTester.parseResponse(rawResponse);
int status = response.getStatus(); int status = response.getStatus();
if (response == null) if (status == 500)
{
LOG.warn("X-Count: {} - Empty Parsed Response", count);
countEmpty.incrementAndGet();
}
else if (status == 500)
{ {
long contentLength = response.getLongField(HttpHeader.CONTENT_LENGTH); long contentLength = response.getLongField(HttpHeader.CONTENT_LENGTH);
String responseBody = response.getContent(); String responseBody = response.getContent();
@ -326,15 +325,13 @@ public class LargeHeaderTest
} }
assertEquals(iterations, count500.get(), () -> assertEquals(iterations, count500.get(), () ->
{ """
return """
All tasks did not fail as expected. All tasks did not fail as expected.
Iterations: %d Iterations: %d
Count (500 response status) [expected]: %d Count (500 response status) [expected]: %d
Count (empty responses): %d Count (empty responses): %d
Count (throwables): %d Count (throwables): %d
Count (other status codes): %d Count (other status codes): %d
""".formatted(iterations, count500.get(), countEmpty.get(), countFailure.get(), countOther.get()); """.formatted(iterations, count500.get(), countEmpty.get(), countFailure.get(), countOther.get()));
});
} }
} }