aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2013-06-06 02:18:31 (EDT)
committerJoakim Erdfelt2013-06-17 12:19:02 (EDT)
commitc22a8f195e99c9aef13d88258c56ba4e332cac8f (patch)
treee80492df1d67d4c6eada074937cd3de53fe55503
parent62c517ee8f372a6949bc58e571a3772849a2971e (diff)
downloadorg.eclipse.jetty.project-c22a8f195e99c9aef13d88258c56ba4e332cac8f.zip
org.eclipse.jetty.project-c22a8f195e99c9aef13d88258c56ba4e332cac8f.tar.gz
org.eclipse.jetty.project-c22a8f195e99c9aef13d88258c56ba4e332cac8f.tar.bz2
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
git removed a newline in the file. Fix the filesize in the test accordingly.
-rw-r--r--jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/WriteThroughAggregateBufferTest.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/WriteThroughAggregateBufferTest.java b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/WriteThroughAggregateBufferTest.java
index b72664a..12a05d9 100644
--- a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/WriteThroughAggregateBufferTest.java
+++ b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/WriteThroughAggregateBufferTest.java
@@ -39,13 +39,11 @@ import org.eclipse.jetty.util.Fields;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-@Ignore
public class WriteThroughAggregateBufferTest extends AbstractHTTPSPDYTest
{
private static final Logger LOG = Log.getLogger(WriteThroughAggregateBufferTest.class);
@@ -100,14 +98,14 @@ public class WriteThroughAggregateBufferTest extends AbstractHTTPSPDYTest
dataInfo.consume(dataInfo.available());
if (dataInfo.isClose())
{
- assertThat("bytes received matches file size: 76848", bytesReceived.get(), is(76848));
+ assertThat("bytes received matches file size: 76847", bytesReceived.get(), is(76847));
dataLatch.countDown();
}
}
});
- assertThat("reply is received", replyLatch.await(500, TimeUnit.SECONDS), is(true));
- assertThat("all data is sent", dataLatch.await(500, TimeUnit.SECONDS), is(true));
+ assertThat("reply is received", replyLatch.await(5, TimeUnit.SECONDS), is(true));
+ assertThat("all data is sent", dataLatch.await(5, TimeUnit.SECONDS), is(true));
}
}