Fixes #10945 - Flaky test ServletTest.testSimpleIdleRead

Increased idle timeout durations, as 250ms is too short for CI. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · Dec 14, 2023 · b7181f3 · b7181f3
1 parent 583bf0a
commit b7181f3
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletTest.java b/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletTest.java
@@ -83,14 +83,15 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
     @Test
     public void testSimpleIdleIgnored() throws Exception
     {
+        long idleTimeout = 1000;
         _context.addServlet(new HttpServlet()
         {
             @Override
             protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
             {
                 try
                 {
-                    Thread.sleep(1000);
+                    Thread.sleep(2 * idleTimeout);
                 }
                 catch (InterruptedException e)
                 {
@@ -100,20 +101,21 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
             }
         }, "/get");
 
-        _connector.setIdleTimeout(250);
+        _connector.setIdleTimeout(idleTimeout);
         _server.start();
 
         String response = _connector.getResponse("""
             GET /ctx/get HTTP/1.0
             
-            """, 5, TimeUnit.SECONDS);
+            """, 5 * idleTimeout, TimeUnit.MILLISECONDS);
         assertThat(response, containsString(" 200 OK"));
         assertThat(response, containsString("Hello!"));
     }
 
     @Test
     public void testSimpleIdleRead() throws Exception
     {
+        long idleTimeout = 1000;
         _context.addServlet(new HttpServlet()
         {
             @Override
@@ -124,7 +126,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
             }
         }, "/post");
 
-        _connector.setIdleTimeout(250);
+        _connector.setIdleTimeout(idleTimeout);
         _server.start();
 
         try (LocalConnector.LocalEndPoint endPoint = _connector.connect())
@@ -148,7 +150,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
             assertThat(response, containsString("Hello 1234567890"));
 
             endPoint.addInputAndExecute(request);
-            response = endPoint.getResponse(false, 5, TimeUnit.SECONDS);
+            response = endPoint.getResponse(false, 2 * idleTimeout, TimeUnit.MILLISECONDS);
             assertThat(response, containsString(" 500 "));
             assertThat(response, containsString("Connection: close"));
         }
@@ -166,7 +168,8 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
             }
         }, "/get");
 
-        _connector.setIdleTimeout(250);
+        long idleTimeout = 1000;
+        _connector.setIdleTimeout(idleTimeout);
         _server.start();
 
         try (LocalConnector.LocalEndPoint endPoint = _connector.connect())
@@ -177,15 +180,15 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
                      
                 """;
             endPoint.addInput(request);
-            String response = endPoint.getResponse();
+            String response = endPoint.getResponse(false, 5, TimeUnit.SECONDS);
             assertThat(response, containsString(" 200 OK"));
             assertThat(response, containsString("Hello!"));
             endPoint.addInput(request);
-            response = endPoint.getResponse();
+            response = endPoint.getResponse(false, 5, TimeUnit.SECONDS);
             assertThat(response, containsString(" 200 OK"));
             assertThat(response, containsString("Hello!"));
 
-            Thread.sleep(500);
+            Thread.sleep(2 * idleTimeout);
 
             assertFalse(endPoint.isOpen());
         }