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

Improved test to guard against race condition.

This commit is contained in:
Simone Bordet 2012-01-27 13:42:59 +01:00
parent b91f9d0dbc
commit 2f58b6980a
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/java/org/eclipse/jetty/spdy/SPDYGoAwayTest.java
View File

@ -1,5 +1,6 @@
package org.eclipse.jetty.spdy;
import java.nio.channels.ClosedChannelException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@ -8,6 +9,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.eclipse.jetty.spdy.api.DataInfo;
import org.eclipse.jetty.spdy.api.GoAwayInfo;
import org.eclipse.jetty.spdy.api.ReplyInfo;
import org.eclipse.jetty.spdy.api.SPDYException;
import org.eclipse.jetty.spdy.api.Session;
import org.eclipse.jetty.spdy.api.SessionStatus;
import org.eclipse.jetty.spdy.api.Stream;
@ -17,6 +19,8 @@ import org.eclipse.jetty.spdy.api.server.ServerSessionFrameListener;
import org.junit.Assert;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
public class SPDYGoAwayTest extends SPDYTest
{
@Test
@ -191,8 +195,18 @@ public class SPDYGoAwayTest extends SPDYTest
Stream stream2 = session.syn(version, new SynInfo(false), null);
Assert.assertTrue(closeLatch.await(5, TimeUnit.SECONDS));
// There is a race between the data we want to send, and the client
// closing the connection because the server closed it after the
// go_away, so we guard with a try/catch to have the test pass cleanly
try
{
stream2.data(new StringDataInfo("foo", true));
Assert.assertFalse(dataLatch.await(1, TimeUnit.SECONDS));
}
catch (SPDYException x)
{
Assert.assertThat(x.getCause(), instanceOf(ClosedChannelException.class));
}
// Be sure the last good stream is the first
Assert.assertTrue(goAwayLatch.await(5, TimeUnit.SECONDS));