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

Fixes #11327 - Flaky test ServletTest.testSimpleIdleRead(). 

Just improving the test code.
The flakyness was likely fixed by the work in #12216 and #12237.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2024-09-09 18:59:03 +02:00
parent fa0502db54
commit 24f0ac28ad
3 changed files with 85 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletTest.java
View File

@ -14,6 +14,9 @@
package org.eclipse.jetty.ee10.servlet; package org.eclipse.jetty.ee10.servlet;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress;
import java.nio.channels.SocketChannel;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import jakarta.servlet.ServletException; import jakarta.servlet.ServletException;
@ -22,8 +25,13 @@ import jakarta.servlet.http.HttpServletMapping;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.MappingMatch; import jakarta.servlet.http.MappingMatch;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpHeaderValue;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.http.HttpTester;
import org.eclipse.jetty.server.LocalConnector; import org.eclipse.jetty.server.LocalConnector;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.IO;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
@ -33,6 +41,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class ServletTest public class ServletTest
{ {
@ -125,7 +134,7 @@ public class ServletTest
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException
{ {
String input = IO.toString(req.getInputStream()); String input = IO.toString(req.getInputStream());
resp.getWriter().println("Hello " + input); resp.getWriter().print("Hello " + input);
} }
}, "/post"); }, "/post");
@ -141,21 +150,64 @@ public class ServletTest
"""; """;
endPoint.addInput(request); endPoint.addInput(request);
endPoint.addInput("1234567890\n"); endPoint.addInput("1234567890");
String response = endPoint.getResponse(false, 5, TimeUnit.SECONDS); HttpTester.Response response = HttpTester.parseResponse(endPoint.getResponse(false, 5, TimeUnit.SECONDS));
assertThat(response, containsString(" 200 OK")); assertThat(response.getStatus(), is(HttpStatus.OK_200));
assertThat(response, containsString("Hello 1234567890")); assertThat(response.getContent(), is("Hello 1234567890"));
endPoint.addInputAndExecute(request); endPoint.addInputAndExecute(request);
endPoint.addInput("1234567890\n"); endPoint.addInput("1234567890");
response = endPoint.getResponse(false, 5, TimeUnit.SECONDS); response = HttpTester.parseResponse(endPoint.getResponse(false, 5, TimeUnit.SECONDS));
assertThat(response, containsString(" 200 OK")); assertThat(response.getStatus(), is(HttpStatus.OK_200));
assertThat(response, containsString("Hello 1234567890")); assertThat(response.getContent(), is("Hello 1234567890"));
endPoint.addInputAndExecute(request); endPoint.addInputAndExecute(request);
response = endPoint.getResponse(false, 2 * idleTimeout, TimeUnit.MILLISECONDS); // Do not send the content.
assertThat(response, containsString(" 500 ")); response = HttpTester.parseResponse(endPoint.getResponse(false, 2 * idleTimeout, TimeUnit.MILLISECONDS));
assertThat(response, containsString("Connection: close")); assertThat(response.getStatus(), is(HttpStatus.INTERNAL_SERVER_ERROR_500));
assertTrue(response.contains(HttpHeader.CONNECTION, HttpHeaderValue.CLOSE.asString()));
}
}
@Test
public void testSimpleIdleReadNetwork() throws Exception
{
ServerConnector networkConnector = new ServerConnector(_server, 1, 1);
_server.addConnector(networkConnector);
long idleTimeout = 1000;
_context.addServlet(new HttpServlet()
{
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException
{
String input = IO.toString(req.getInputStream());
resp.getWriter().print("Hello " + input);
}
}, "/post");
networkConnector.setIdleTimeout(idleTimeout);
_server.start();
try (SocketChannel client = SocketChannel.open(new InetSocketAddress("localhost", networkConnector.getLocalPort())))
{
String request = """
POST /ctx/post HTTP/1.1
Host: local
Content-Length: 10
""";
client.write(StandardCharsets.UTF_8.encode(request));
client.write(StandardCharsets.UTF_8.encode("1234567890"));
HttpTester.Response response = HttpTester.parseResponse(client);
assertThat(response.getStatus(), is(HttpStatus.OK_200));
assertThat(response.getContent(), is("Hello 1234567890"));
client.write(StandardCharsets.UTF_8.encode(request));
// Do not send the content.
response = HttpTester.parseResponse(client);
assertThat(response.getStatus(), is(HttpStatus.INTERNAL_SERVER_ERROR_500));
assertTrue(response.contains(HttpHeader.CONNECTION, HttpHeaderValue.CLOSE.asString()));
} }
} }

1
jetty-ee10/jetty-ee10-servlet/src/test/resources/jetty-logging.properties
View File

@ -1,4 +1,3 @@
# Jetty Logging using jetty-slf4j-impl
#org.eclipse.jetty.LEVEL=DEBUG #org.eclipse.jetty.LEVEL=DEBUG
#org.eclipse.jetty.http.LEVEL=DEBUG #org.eclipse.jetty.http.LEVEL=DEBUG
#org.eclipse.jetty.server.LEVEL=DEBUG #org.eclipse.jetty.server.LEVEL=DEBUG

31
jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletTest.java
View File

@ -20,6 +20,10 @@ import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpHeaderValue;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.http.HttpTester;
import org.eclipse.jetty.server.LocalConnector; import org.eclipse.jetty.server.LocalConnector;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.IO;
@ -29,7 +33,9 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class ServletTest public class ServletTest
{ {
@ -122,7 +128,7 @@ public class ServletTest
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException
{ {
String input = IO.toString(req.getInputStream()); String input = IO.toString(req.getInputStream());
resp.getWriter().println("Hello " + input); resp.getWriter().print("Hello " + input);
} }
}), "/post"); }), "/post");
@ -138,21 +144,22 @@ public class ServletTest
"""; """;
endPoint.addInput(request); endPoint.addInput(request);
endPoint.addInput("1234567890\n"); endPoint.addInput("1234567890");
String response = endPoint.getResponse(false, 5, TimeUnit.SECONDS); HttpTester.Response response = HttpTester.parseResponse(endPoint.getResponse(false, 5, TimeUnit.SECONDS));
assertThat(response, containsString(" 200 OK")); assertThat(response.getStatus(), is(HttpStatus.OK_200));
assertThat(response, containsString("Hello 1234567890")); assertThat(response.getContent(), is("Hello 1234567890"));
endPoint.addInputAndExecute(request); endPoint.addInputAndExecute(request);
endPoint.addInput("1234567890\n"); endPoint.addInput("1234567890");
response = endPoint.getResponse(false, 5, TimeUnit.SECONDS); response = HttpTester.parseResponse(endPoint.getResponse(false, 5, TimeUnit.SECONDS));
assertThat(response, containsString(" 200 OK")); assertThat(response.getStatus(), is(HttpStatus.OK_200));
assertThat(response, containsString("Hello 1234567890")); assertThat(response.getContent(), is("Hello 1234567890"));
endPoint.addInputAndExecute(request); endPoint.addInputAndExecute(request);
response = endPoint.getResponse(false, 2 * idleTimeout, TimeUnit.MILLISECONDS); // Do not send the content.
assertThat(response, containsString(" 500 ")); response = HttpTester.parseResponse(endPoint.getResponse(false, 2 * idleTimeout, TimeUnit.MILLISECONDS));
assertThat(response, containsString("Connection: close")); assertThat(response.getStatus(), is(HttpStatus.INTERNAL_SERVER_ERROR_500));
assertTrue(response.contains(HttpHeader.CONNECTION, HttpHeaderValue.CLOSE.asString()));
} }
} }