Added timeouts to client, webserver and tests to identify intermitten…

…t freezes. (#2305) Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
helidon-io · Aug 31, 2020 · 99bdaac · 99bdaac
1 parent ac6f491
commit 99bdaac
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/webserver/webserver/src/test/java/io/helidon/webserver/TestHttpParsingDefaults.java b/webserver/webserver/src/test/java/io/helidon/webserver/TestHttpParsingDefaults.java
@@ -31,6 +31,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -45,11 +46,20 @@ class TestHttpParsingDefaults {
 
     @BeforeAll
     static void initClass() throws InterruptedException, ExecutionException, TimeoutException {
-        client = ClientBuilder.newClient();
+        client = ClientBuilder.newBuilder()
+                .connectTimeout(5, TimeUnit.SECONDS)
+                .readTimeout(10, TimeUnit.SECONDS)
+                .build();
+
+        ServerConfiguration serverConfig = ServerConfiguration.builder()
+                // a timeout of 10 seconds, to prevent infinite hangs
+                .timeout(10000)
+                .build();
 
         webServer = WebServer.builder(Routing.builder()
                                               .any(TestHttpParsingDefaults::handleRequest)
                                               .build())
+                .config(serverConfig)
                 .build()
                 .start()
                 .toCompletableFuture()
@@ -71,34 +81,40 @@ static void destroyClass() throws InterruptedException, ExecutionException, Time
     }
 
     @Test
+    @Timeout(20)
     void testOkHeader() {
         testHeader(target, 8000, true);
     }
 
     @Test
+    @Timeout(20)
     void testLongHeader() {
         testHeader(target, 8900, false);
         testHeader(target, 8900, false);
     }
 
     @Test
+    @Timeout(20)
     void testOkInitialLine() {
         testInitialLine(target, 10, true);
     }
 
     @Test
+    @Timeout(20)
     void testLongInitialLine() {
         // now test with big initial line
         testInitialLine(target, 5000, false);
         testInitialLine(target, 5000, false);
     }
 
     @Test
+    @Timeout(20)
     void testGoodHeaderName() {
         testHeaderName(target, GOOD_HEADER_NAME, true);
     }
 
     @Test
+    @Timeout(20)
     void testBadHeaderName() {
         testHeaderName(target, BAD_HEADER_NAME, false);
         testHeaderName(target, BAD_HEADER_NAME, false);
@@ -152,6 +168,7 @@ static void testInitialLine(WebTarget target, int size, boolean success) {
                        response.getStatus(),
                        is(Http.Status.BAD_REQUEST_400.code()));
         }
+        response.close();
     }
 
     static void testHeader(WebTarget target, int size, boolean success) {