minor cleanups a potential flaky fix

jetty · Sep 1, 2024 · 3d5a58a · 3d5a58a
1 parent ebc5e55
commit 3d5a58a
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/LargeHeaderTest.java b/jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/LargeHeaderTest.java
@@ -48,6 +48,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class LargeHeaderTest
 {
@@ -79,7 +80,7 @@ public void setup() throws Exception
             }
 
             @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");
                 LOG.debug("X-Count: {} [handle]", idCount);
@@ -245,8 +246,11 @@ else if (response.getStatus() == 500)
             throw issues;
         }
 
+        for (Future<Void> future : futures)
+            future.get(2, TimeUnit.SECONDS);
+
         executorService.shutdown();
-        executorService.awaitTermination(timeout * 2, TimeUnit.SECONDS);
+        assertTrue(executorService.awaitTermination(timeout * 2, TimeUnit.SECONDS));
         assertEquals(iterations, count500.get(), () ->
         {
             return """
@@ -297,12 +301,7 @@ public void testLargeHeaderNewConnectionsSequential() throws Throwable
                 }
                 HttpTester.Response response = HttpTester.parseResponse(rawResponse);
                 int status = response.getStatus();
-                if (response == null)
-                {
-                    LOG.warn("X-Count: {} - Empty Parsed Response", count);
-                    countEmpty.incrementAndGet();
-                }
-                else if (status == 500)
+                if (status == 500)
                 {
                     long contentLength = response.getLongField(HttpHeader.CONTENT_LENGTH);
                     String responseBody = response.getContent();
@@ -326,15 +325,13 @@ else if (status == 500)
         }
 
         assertEquals(iterations, count500.get(), () ->
-        {
-            return """
+            """
                 All tasks did not fail as expected.
                 Iterations: %d
                 Count (500 response status) [expected]: %d
                 Count (empty responses): %d
                 Count (throwables): %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()));
     }
 }