aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2013-06-06 08:48:03 (EDT)
committerThomas Becker2013-06-06 08:48:03 (EDT)
commit5c8b78596230bfa2f619bfcf85757608b90415e5 (patch)
tree1c08b0997a4f9436c00c65b4fdb7d7f67d5db03e
parent82b73c065f15414daad553c0c883626d6302202b (diff)
downloadorg.eclipse.jetty.project-5c8b78596230bfa2f619bfcf85757608b90415e5.zip
org.eclipse.jetty.project-5c8b78596230bfa2f619bfcf85757608b90415e5.tar.gz
org.eclipse.jetty.project-5c8b78596230bfa2f619bfcf85757608b90415e5.tar.bz2
406759 supressed two stacktraces thrown in ProxySPDYToHTTPTest
-rw-r--r--jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPTest.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPTest.java b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPTest.java
index 6a6c2ef..658c386 100644
--- a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPTest.java
+++ b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/proxy/ProxySPDYToHTTPTest.java
@@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.HttpChannel;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
@@ -55,6 +56,8 @@ import org.eclipse.jetty.spdy.server.http.HTTPSPDYHeader;
import org.eclipse.jetty.spdy.server.http.SPDYTestUtils;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.Fields;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.StdErrLog;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.After;
import org.junit.Assert;
@@ -156,6 +159,7 @@ public class ProxySPDYToHTTPTest
proxy.join();
}
factory.stop();
+ ((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(false);
}
@Test
@@ -436,6 +440,7 @@ public class ProxySPDYToHTTPTest
}).get(5, TimeUnit.SECONDS);
Fields headers = SPDYTestUtils.createHeaders("localhost", proxyAddress.getPort(), version, "POST", "/");
+ ((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(true);
client.syn(new SynInfo(headers, false), null);
assertThat("goAway has been received by proxy", goAwayLatch.await(2 * timeout, TimeUnit.MILLISECONDS),
is(true));