aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2013-07-03 11:12:13 (EDT)
committerThomas Becker2013-07-03 11:12:13 (EDT)
commita85711420d85ec16174844f3279d668b1393b8e7 (patch)
tree96708d2031cde61b67b633ceb43c51770cf44588
parente4c7cfbf37291abeedb97507b1b4f4189a678194 (diff)
downloadorg.eclipse.jetty.project-a85711420d85ec16174844f3279d668b1393b8e7.zip
org.eclipse.jetty.project-a85711420d85ec16174844f3279d668b1393b8e7.tar.gz
org.eclipse.jetty.project-a85711420d85ec16174844f3279d668b1393b8e7.tar.bz2
409282 fix intermittently failing MaxConcurrentStreamTest
-rw-r--r--jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/MaxConcurrentStreamTest.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/MaxConcurrentStreamTest.java b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/MaxConcurrentStreamTest.java
index 0b41c90..a3fe141 100644
--- a/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/MaxConcurrentStreamTest.java
+++ b/jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/MaxConcurrentStreamTest.java
@@ -36,13 +36,14 @@ import org.eclipse.jetty.spdy.api.SynInfo;
import org.eclipse.jetty.spdy.api.server.ServerSessionFrameListener;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Fields;
-import org.junit.Ignore;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-@Ignore("Fails the build too often. Runs fine always when run alone.")
+@RunWith(JUnit4.class)
public class MaxConcurrentStreamTest extends AbstractTest
{
@Test
@@ -116,7 +117,5 @@ public class MaxConcurrentStreamTest extends AbstractTest
stream.data(new ByteBufferDataInfo(BufferUtil.EMPTY_BUFFER, true));
assertThat("Data has been received on first stream.", dataReceivedLatch.await(5, TimeUnit.SECONDS), is(true));
-
- session.syn(synInfo, null);
}
}