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

Disabling InsufficientBytes tests in 9.3 (fixed in 9.4+)

This commit is contained in:
Joakim Erdfelt 2017-02-06 11:06:12 -07:00
parent b72854f02b
commit 98688052ef
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
View File

@ -66,7 +66,7 @@ public abstract class AbstractHttpTest
{
server = new Server();
connector = new ServerConnector(server,null,null,new ArrayByteBufferPool(64,2048,64*1024),1,1,new HttpConnectionFactory());
connector.setIdleTimeout(100000);
connector.setIdleTimeout(10000);
server.addConnector(connector);
stacklessChannelLogging =new StacklessLogging(HttpChannel.class);

25
jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToCommitTest.java
View File

@ -33,6 +33,8 @@ import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.http.HttpTester;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@ -419,6 +421,7 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest
}
@Test
@Ignore("Not implemented in Jetty 9.3 (Proper support present in Jetty 9.4+)")
public void testSetContentLengthFlushAndWriteInsufficientBytes() throws Exception
{
server.setHandler(new SetContentLengthAndWriteInsufficientBytesHandler(true));
@ -434,6 +437,7 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest
}
@Test
@Ignore("Not implemented in Jetty 9.3 (Proper support present in Jetty 9.4+)")
public void testSetContentLengthAndWriteInsufficientBytes() throws Exception
{
server.setHandler(new SetContentLengthAndWriteInsufficientBytesHandler(false));
@ -469,7 +473,26 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest
assertThat("response code", response.getStatus(), is(200));
assertThat("response body", response.getContent(), is("foo"));
}
private class SetContentLengthAndWriteInsufficientBytesHandler extends AbstractHandler
{
boolean flush;
private SetContentLengthAndWriteInsufficientBytesHandler(boolean flush)
{
this.flush = flush;
}
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
baseRequest.setHandled(true);
response.setContentLength(6);
if (flush)
response.flushBuffer();
response.getWriter().write("foo");
}
}
private class SetContentLengthAndWriteThatAmountOfBytesHandler extends ThrowExceptionOnDemandHandler
{
private SetContentLengthAndWriteThatAmountOfBytesHandler(boolean throwException)