Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2013-02-25 23:54:16 +0000
committerJoakim Erdfelt2013-02-25 23:54:16 +0000
commit283cd58147d2830354c06ebd2cbc8c52c3b69ee1 (patch)
treedce0f668248f36b4f53b58f183e38219fabe62a5
parent8f4b569076221526429e6b49865cafcae1ade42a (diff)
parent2ed0dc8fff280559547838379893536871322dc6 (diff)
downloadorg.eclipse.jetty.project-283cd58147d2830354c06ebd2cbc8c52c3b69ee1.tar.gz
org.eclipse.jetty.project-283cd58147d2830354c06ebd2cbc8c52c3b69ee1.tar.xz
org.eclipse.jetty.project-283cd58147d2830354c06ebd2cbc8c52c3b69ee1.zip
Merge branch 'jetty-7' into jetty-8
-rw-r--r--jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMinVersionTest.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMinVersionTest.java b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMinVersionTest.java
index 5fb4713c0f..141231d63e 100644
--- a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMinVersionTest.java
+++ b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMinVersionTest.java
@@ -93,10 +93,7 @@ public class WebSocketMinVersionTest
}
catch(IllegalStateException e) {
String respHeader = e.getMessage();
- Assert.assertThat("Response Header", respHeader, allOf(
- containsString("HTTP/1.1 400 Unsupported"),
- containsString("minVersion [8]"),
- containsString("[13, 8]")));
+ Assert.assertThat("Response Header", respHeader, containsString("HTTP/1.1 400 Unsupported websocket version specification"));
}
finally
{

Back to the top