added trap for rare error

2 files changed, 19 insertions, 2 deletions

diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/AsyncSslHttpExchangeTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/AsyncSslHttpExchangeTest.java
index 6e6e3e01e9..875e224594 100644
--- a/jetty-client/src/test/java/org/eclipse/jetty/client/AsyncSslHttpExchangeTest.java
+++ b/jetty-client/src/test/java/org/eclipse/jetty/client/AsyncSslHttpExchangeTest.java
@@ -40,9 +40,9 @@ public class AsyncSslHttpExchangeTest extends SslHttpExchangeTest
 
 
     @Override
-    public void testGetWithContentExchange() throws Exception
+    public void testBigPostWithContentExchange() throws Exception
     {
-        super.testGetWithContentExchange();
+        super.testBigPostWithContentExchange();
     }
     
 }
diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java
index dba5bc9732..0a01f6cfba 100644
--- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java
+++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java
@@ -469,6 +469,23 @@ public class HttpExchangeTest
         httpExchange.setRequestContentType("application/data");
         httpExchange.setRequestContent(niobuf);
         _httpClient.send(httpExchange);
+        
+        long start=System.currentTimeMillis();
+        while(!httpExchange.isDone())
+        {
+            long now=System.currentTimeMillis();
+            if ((now-start)>=10000)
+            {
+                System.err.println("TEST IS TAKING TOOOOO LONG!!!!!!!!!!!!!!!!!!!!");
+                System.err.println("CLIENT:");
+                System.err.println(_httpClient.dump());
+                System.err.println("SERVER:");
+                _server.dumpStdErr();
+                new Throwable().printStackTrace();
+                break;
+            }
+            Thread.sleep(100);
+        }
         status = httpExchange.waitForDone();
         assertEquals(HttpExchange.STATUS_COMPLETED, status);
         result=httpExchange.getResponseContent();