diff --git a/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java b/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java index 6f666e02d37..00dd2b59f02 100644 --- a/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java +++ b/spdy-core/src/test/java/org/eclipse/jetty/spdy/api/ClientUsageTest.java @@ -61,7 +61,7 @@ public class ClientUsageTest // Then issue another similar request stream.getSession().syn(new SynInfo(true), this); } - }).get(); + }).get(5, TimeUnit.SECONDS); // Send-and-forget the data stream.data(new StringDataInfo("data", true)); } diff --git a/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/AbstractHTTPSPDYTest.java b/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/AbstractHTTPSPDYTest.java index 2ea66cbae8f..a1dd6650020 100644 --- a/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/AbstractHTTPSPDYTest.java +++ b/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/AbstractHTTPSPDYTest.java @@ -18,6 +18,7 @@ package org.eclipse.jetty.spdy.http; import java.net.InetSocketAddress; import java.util.concurrent.Executor; +import java.util.concurrent.TimeUnit; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; @@ -85,7 +86,7 @@ public abstract class AbstractHTTPSPDYTest clientFactory = newSPDYClientFactory(threadPool); clientFactory.start(); } - return clientFactory.newSPDYClient(SPDY.V2).connect(socketAddress, listener).get(); + return clientFactory.newSPDYClient(SPDY.V2).connect(socketAddress, listener).get(5, TimeUnit.SECONDS); } protected SPDYClient.Factory newSPDYClientFactory(Executor threadPool) diff --git a/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYTest.java b/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYTest.java index 2416b763598..3b358a5e9ac 100644 --- a/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYTest.java +++ b/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYTest.java @@ -206,7 +206,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest Assert.assertTrue(replyHeaders.get("status").value().contains("200")); replyLatch.countDown(); } - }).get(); + }).get(5, TimeUnit.SECONDS); stream.data(new StringDataInfo(data, true)); Assert.assertTrue(handlerLatch.await(5, TimeUnit.SECONDS)); @@ -251,7 +251,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest Assert.assertTrue(replyHeaders.get("status").value().contains("200")); replyLatch.countDown(); } - }).get(); + }).get(5, TimeUnit.SECONDS); // Sleep between the data frames so that they will be read in 2 reads stream.data(new StringDataInfo(data1, false)); Thread.sleep(1000); @@ -299,7 +299,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest Assert.assertTrue(replyHeaders.get("status").value().contains("200")); replyLatch.countDown(); } - }).get(); + }).get(5, TimeUnit.SECONDS); // Send the data frames consecutively, so the server reads both frames in one read stream.data(new StringDataInfo(data1, false)); stream.data(new StringDataInfo(data2, true)); diff --git a/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java index 8e869e0c7c1..ba92c9307ca 100644 --- a/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java +++ b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/AbstractTest.java @@ -18,6 +18,7 @@ package org.eclipse.jetty.spdy; import java.net.InetSocketAddress; import java.util.concurrent.Executor; +import java.util.concurrent.TimeUnit; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.spdy.api.SPDY; @@ -74,7 +75,7 @@ public abstract class AbstractTest clientFactory = newSPDYClientFactory(threadPool); clientFactory.start(); } - return clientFactory.newSPDYClient(SPDY.V2).connect(socketAddress, listener).get(); + return clientFactory.newSPDYClient(SPDY.V2).connect(socketAddress, listener).get(5, TimeUnit.SECONDS); } protected SPDYClient.Factory newSPDYClientFactory(Executor threadPool) diff --git a/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java index 361aa77e877..ec2a0f6f672 100644 --- a/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java +++ b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/GoAwayTest.java @@ -96,7 +96,7 @@ public class GoAwayTest extends AbstractTest }; Session session = startClient(startServer(serverSessionFrameListener), clientSessionFrameListener); - Stream stream1 = session.syn(new SynInfo(true), null).get(); + Stream stream1 = session.syn(new SynInfo(true), null).get(5, TimeUnit.SECONDS); Assert.assertTrue(latch.await(5, TimeUnit.SECONDS)); GoAwayInfo goAwayInfo = ref.get(); @@ -129,17 +129,15 @@ public class GoAwayTest extends AbstractTest return null; } }; - final AtomicReference ref = new AtomicReference<>(); SessionFrameListener clientSessionFrameListener = new SessionFrameListener.Adapter() { @Override public void onGoAway(Session session, GoAwayInfo goAwayInfo) { - ref.get().syn(new SynInfo(true), null); + session.syn(new SynInfo(true), null); } }; Session session = startClient(startServer(serverSessionFrameListener), clientSessionFrameListener); - ref.set(session); session.syn(new SynInfo(true), null); @@ -201,11 +199,11 @@ public class GoAwayTest extends AbstractTest { reply1Latch.countDown(); } - }).get(); + }).get(5, TimeUnit.SECONDS); Assert.assertTrue(reply1Latch.await(5, TimeUnit.SECONDS)); // Second stream is closed in the middle - Stream stream2 = session.syn(new SynInfo(false), null).get(); + Stream stream2 = session.syn(new SynInfo(false), null).get(5, TimeUnit.SECONDS); Assert.assertTrue(closeLatch.await(5, TimeUnit.SECONDS)); // There is a race between the data we want to send, and the client diff --git a/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/IdleTimeoutTest.java b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/IdleTimeoutTest.java index ace61804812..3138bce5f90 100644 --- a/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/IdleTimeoutTest.java +++ b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/IdleTimeoutTest.java @@ -173,7 +173,7 @@ public class IdleTimeoutTest extends AbstractTest SPDYClient client = clientFactory.newSPDYClient(SPDY.V2); long maxIdleTime = 1000; client.setMaxIdleTime(maxIdleTime); - Session session = client.connect(address, null).get(); + Session session = client.connect(address, null).get(5, TimeUnit.SECONDS); session.syn(new SynInfo(true), null); @@ -200,7 +200,7 @@ public class IdleTimeoutTest extends AbstractTest SPDYClient client = clientFactory.newSPDYClient(SPDY.V2); long maxIdleTime = 1000; client.setMaxIdleTime(maxIdleTime); - Session session = client.connect(address, null).get(); + Session session = client.connect(address, null).get(5, TimeUnit.SECONDS); session.syn(new SynInfo(true), null); @@ -234,7 +234,7 @@ public class IdleTimeoutTest extends AbstractTest clientFactory.start(); SPDYClient client = clientFactory.newSPDYClient(SPDY.V2); client.setMaxIdleTime(maxIdleTime); - Session session = client.connect(address, null).get(); + Session session = client.connect(address, null).get(5, TimeUnit.SECONDS); final CountDownLatch replyLatch = new CountDownLatch(1); session.syn(new SynInfo(true), new StreamFrameListener.Adapter() diff --git a/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PingTest.java b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PingTest.java index 49be5ebcde3..aca05954d17 100644 --- a/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PingTest.java +++ b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/PingTest.java @@ -45,7 +45,7 @@ public class PingTest extends AbstractTest } }; Session session = startClient(startServer(null), clientSessionFrameListener); - PingInfo pingInfo = session.ping().get(); + PingInfo pingInfo = session.ping().get(5, TimeUnit.SECONDS); Assert.assertEquals(1, pingInfo.getPingId() % 2); Assert.assertTrue(latch.await(5, TimeUnit.SECONDS)); diff --git a/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynDataReplyDataLoadTest.java b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynDataReplyDataLoadTest.java index 5a873781b91..cac04f78942 100644 --- a/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynDataReplyDataLoadTest.java +++ b/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SynDataReplyDataLoadTest.java @@ -100,7 +100,7 @@ public class SynDataReplyDataLoadTest extends AbstractTest ExecutorService threadPool = Executors.newFixedThreadPool(count); List> futures = threadPool.invokeAll(tasks); for (Future future : futures) - future.get(); + future.get(5, TimeUnit.SECONDS); Assert.assertTrue(latch.await(count * iterations * 100, TimeUnit.MILLISECONDS)); threadPool.shutdown(); } @@ -128,7 +128,7 @@ public class SynDataReplyDataLoadTest extends AbstractTest Assert.assertEquals(0, dataInfo.available()); latch.countDown(); } - }).get(); + }).get(5, TimeUnit.SECONDS); stream.data(new StringDataInfo("data_" + stream.getId(), true)); Assert.assertTrue("process() failed for stream=" + stream.getId(), latch.await(5, TimeUnit.SECONDS)); }