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

Merge branch 'jetty-9.4.x'

This commit is contained in:
Joakim Erdfelt 2016-12-20 15:38:51 -07:00
parent 7e3416567d 64f714689e
commit 243c24338f
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,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

@ -43,6 +43,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();
@ -84,7 +86,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";
@ -118,7 +120,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();
@ -127,7 +129,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();
@ -160,7 +162,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();
@ -169,7 +171,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();

3
pom.xml
View File

@ -368,7 +368,7 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty.toolchain</groupId> <groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-version-maven-plugin</artifactId> <artifactId>jetty-version-maven-plugin</artifactId>
<version>2.3</version> <version>2.4</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -1147,6 +1147,7 @@
<phase>generate-resources</phase> <phase>generate-resources</phase>
<goals> <goals>
<goal>update-version-text</goal> <goal>update-version-text</goal>
<goal>tag</goal>
</goals> </goals>
<configuration> <configuration>
<refreshTags>true</refreshTags> <refreshTags>true</refreshTags>