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

Bumping up test timeouts

This commit is contained in:
Joakim Erdfelt 2016-12-20 14:31:56 -07:00
parent 4bfb312a8c
commit b9fd70f5ad
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/PerMessageDeflateExtensionTest.java
View File

@ -18,6 +18,10 @@
package org.eclipse.jetty.websocket.server; package org.eclipse.jetty.websocket.server;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -43,10 +47,6 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters; import org.junit.runners.Parameterized.Parameters;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
public class PerMessageDeflateExtensionTest public class PerMessageDeflateExtensionTest
{ {
@ -155,7 +155,7 @@ public class PerMessageDeflateExtensionTest
Future<Session> fut = client.connect(clientSocket,server.getServerUri(),request); Future<Session> fut = client.connect(clientSocket,server.getServerUri(),request);
// Wait for connect // Wait for connect
Session session = fut.get(5,TimeUnit.SECONDS); Session session = fut.get(30,TimeUnit.SECONDS);
assertThat("Response.extensions",getNegotiatedExtensionList(session),containsString("permessage-deflate")); assertThat("Response.extensions",getNegotiatedExtensionList(session),containsString("permessage-deflate"));

12
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java
View File

@ -41,6 +41,8 @@ import org.junit.Test;
public class WebSocketOverSSLTest public class WebSocketOverSSLTest
{ {
public static final int CONNECT_TIMEOUT = 15000;
public static final int FUTURE_TIMEOUT_SEC = 30;
@Rule @Rule
public TestTracker tracker = new TestTracker(); public TestTracker tracker = new TestTracker();
@ -82,7 +84,7 @@ public class WebSocketOverSSLTest
Future<Session> fut = client.connect(clientSocket,requestUri); Future<Session> fut = client.connect(clientSocket,requestUri);
// wait for connect // wait for connect
Session session = fut.get(3,TimeUnit.SECONDS); Session session = fut.get(FUTURE_TIMEOUT_SEC,TimeUnit.SECONDS);
// Generate text frame // Generate text frame
String msg = "this is an echo ... cho ... ho ... o"; String msg = "this is an echo ... cho ... ho ... o";
@ -116,7 +118,7 @@ public class WebSocketOverSSLTest
WebSocketClient client = new WebSocketClient(server.getSslContextFactory(),null,bufferPool); WebSocketClient client = new WebSocketClient(server.getSslContextFactory(),null,bufferPool);
try try
{ {
client.setConnectTimeout(3000); client.setConnectTimeout(CONNECT_TIMEOUT);
client.start(); client.start();
CaptureSocket clientSocket = new CaptureSocket(); CaptureSocket clientSocket = new CaptureSocket();
@ -125,7 +127,7 @@ public class WebSocketOverSSLTest
Future<Session> fut = client.connect(clientSocket,requestUri); Future<Session> fut = client.connect(clientSocket,requestUri);
// wait for connect // wait for connect
Session session = fut.get(5,TimeUnit.SECONDS); Session session = fut.get(FUTURE_TIMEOUT_SEC,TimeUnit.SECONDS);
// Generate text frame // Generate text frame
RemoteEndpoint remote = session.getRemote(); RemoteEndpoint remote = session.getRemote();
@ -158,7 +160,7 @@ public class WebSocketOverSSLTest
WebSocketClient client = new WebSocketClient(server.getSslContextFactory(),null,bufferPool); WebSocketClient client = new WebSocketClient(server.getSslContextFactory(),null,bufferPool);
try try
{ {
client.setConnectTimeout(3000); client.setConnectTimeout(CONNECT_TIMEOUT);
client.start(); client.start();
CaptureSocket clientSocket = new CaptureSocket(); CaptureSocket clientSocket = new CaptureSocket();
@ -167,7 +169,7 @@ public class WebSocketOverSSLTest
Future<Session> fut = client.connect(clientSocket,requestUri); Future<Session> fut = client.connect(clientSocket,requestUri);
// wait for connect // wait for connect
Session session = fut.get(5,TimeUnit.SECONDS); Session session = fut.get(FUTURE_TIMEOUT_SEC,TimeUnit.SECONDS);
// Generate text frame // Generate text frame
RemoteEndpoint remote = session.getRemote(); RemoteEndpoint remote = session.getRemote();