cleanup after merge

jetty-client/src/test/java/org/eclipse/jetty/client/IdleTimeoutTest.java

@@ -36,9 +36,10 @@ public class IdleTimeoutTest
     public int _repetitions = 30;
     
     @Ignore
-    //@Test
+    @Test
     public void testIdleTimeoutOnBlockingConnector() throws Exception
     {
+        /* TODO port to new client
         final HttpClient client = new HttpClient();
         client.setMaxConnectionsPerAddress(4);
         client.setConnectorType(HttpClient.CONNECTOR_SOCKET);
@@ -75,6 +76,8 @@ public class IdleTimeoutTest
         runner.start();
         if (!counter.await(80, TimeUnit.SECONDS))
             Assert.fail("Test did not complete in time");
+            
+            */
         
     }
 }

jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java

@@ -298,7 +298,7 @@ public class GzipTester
     private void assertResponseHeaders(int expectedFilesize, int status, HttpTester.Response response)
     {
         Assert.assertThat("Response.status",response.getStatus(),is(status));
-        Assert.assertThat("Response.header[Content-Encoding]",response.getHeader("Content-Encoding"),not(containsString(compressionType)));
+        Assert.assertThat("Response.header[Content-Encoding]",response.get("Content-Encoding"),not(containsString(compressionType)));
         if (expectedFilesize != (-1))
         {
             Assert.assertEquals(expectedFilesize,response.getContentBytes().length);

tests/test-webapps/test-jetty-webapp/pom.xml

@@ -201,6 +201,12 @@
       <artifactId>websocket-servlet</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-server</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>