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

Issue #1832 work around

This commit is contained in:
Greg Wilkins 2017-09-26 17:04:42 +10:00
parent c2b7177628
commit e58a7b488e
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
View File

@ -357,7 +357,7 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture
try (Socket client = newSocket(_serverURI.getHost(), _serverURI.getPort()); try (Socket client = newSocket(_serverURI.getHost(), _serverURI.getPort());
StacklessLogging stackless = new StacklessLogging(HttpConnection.class)) StacklessLogging stackless = new StacklessLogging(HttpConnection.class))
{ {
Log.getLogger(HttpConnection.class).info("expect header is too large, then ISE extra data ..."); Log.getLogger(HttpConnection.class).info("expect header is too large ...");
OutputStream os = client.getOutputStream(); OutputStream os = client.getOutputStream();
byte[] buffer = new byte[64 * 1024]; byte[] buffer = new byte[64 * 1024];
@ -379,9 +379,16 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture
buffer[15]='H'; buffer[15]='H';
buffer[16]=':'; buffer[16]=':';
Arrays.fill(buffer,17,buffer.length-1,(byte)'A'); Arrays.fill(buffer,17,buffer.length-1,(byte)'A');
// write the request.
try
{
os.write(buffer); os.write(buffer);
os.flush(); os.flush();
}
catch(Exception e)
{
// Ignore exceptions during writing, so long as we can read response below
}
// Read the response. // Read the response.
try try
@ -391,7 +398,8 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture
} }
catch(Exception e) catch(Exception e)
{ {
// TODO evaluate why we sometimes get an early close on this test Log.getLogger(HttpServerTestBase.class).warn("TODO Early close???");
// TODO #1832 evaluate why we sometimes get an early close on this test
} }
} }
} }

8
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java
View File

@ -118,16 +118,9 @@ public class SelectChannelServerSslTest extends HttpServerTestBase
@Override @Override
public void testFullHeader() throws Exception public void testFullHeader() throws Exception
{
try
{ {
super.testFullHeader(); super.testFullHeader();
} }
catch (SocketException|SSLException e)
{
Log.getLogger(SslConnection.class).warn("Close overtook 400 response");
}
}
@Before @Before
public void init() throws Exception public void init() throws Exception
@ -168,7 +161,6 @@ public class SelectChannelServerSslTest extends HttpServerTestBase
} }
catch(Exception e) catch(Exception e)
{ {
e.printStackTrace();
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }