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

Issue #6728 - QUIC and HTTP/3 

- Added timeouts for QUIC tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2021-10-21 20:07:36 +02:00
parent 4eaff8e880
commit 8e81c80e1e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jetty-quic/quic-client/src/test/java/org/eclipse/jetty/quic/client/End2EndClientTest.java
View File

@ -16,6 +16,7 @@ package org.eclipse.jetty.quic.client;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -101,7 +102,9 @@ public class End2EndClientTest
@Test @Test
public void testSimpleHTTP1() throws Exception public void testSimpleHTTP1() throws Exception
{ {
ContentResponse response = client.GET("https://localhost:" + connector.getLocalPort()); ContentResponse response = client.newRequest("https://localhost:" + connector.getLocalPort())
.timeout(5, TimeUnit.SECONDS)
.send();
assertThat(response.getStatus(), is(200)); assertThat(response.getStatus(), is(200));
String contentAsString = response.getContentAsString(); String contentAsString = response.getContentAsString();
assertThat(contentAsString, is(responseContent)); assertThat(contentAsString, is(responseContent));
@ -112,6 +115,7 @@ public class End2EndClientTest
{ {
ContentResponse response = client.newRequest("https://localhost:" + connector.getLocalPort()) ContentResponse response = client.newRequest("https://localhost:" + connector.getLocalPort())
.version(HttpVersion.HTTP_2) .version(HttpVersion.HTTP_2)
.timeout(5, TimeUnit.SECONDS)
.send(); .send();
assertThat(response.getStatus(), is(200)); assertThat(response.getStatus(), is(200));
String contentAsString = response.getContentAsString(); String contentAsString = response.getContentAsString();
@ -123,7 +127,9 @@ public class End2EndClientTest
{ {
for (int i = 0; i < 1000; i++) for (int i = 0; i < 1000; i++)
{ {
ContentResponse response = client.GET("https://localhost:" + connector.getLocalPort() + "/" + i); ContentResponse response = client.newRequest("https://localhost:" + connector.getLocalPort() + "/" + i)
.timeout(5, TimeUnit.SECONDS)
.send();
assertThat(response.getStatus(), is(200)); assertThat(response.getStatus(), is(200));
String contentAsString = response.getContentAsString(); String contentAsString = response.getContentAsString();
assertThat(contentAsString, is(responseContent)); assertThat(contentAsString, is(responseContent));
@ -153,6 +159,8 @@ public class End2EndClientTest
} }
}); });
} }
CompletableFuture.allOf(futures).join(); CompletableFuture.allOf(futures)
.orTimeout(15, TimeUnit.SECONDS)
.join();
} }
} }