summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-12-12 13:33:00 +0100
committerGitHub <noreply@github.com>2018-12-12 13:33:00 +0100
commita6ac6fa83b28372727b70d776652fd05240e74f5 (patch)
tree00eb6b7808844e50495ee8f14ff04a045c1bd08d /jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
parentcf4ba9d201390e2fe24c8bb068aa4a39db474e92 (diff)
parentd069b916a89a2e40800a6a143aeef4e73826473c (diff)
Merge pull request #7928 from vespa-engine/gjoranv/revert-throttling
Gjoranv/revert throttling
Diffstat (limited to 'jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java')
-rw-r--r--jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java17
1 files changed, 0 insertions, 17 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
index 9622edc5429..30d5f9e657a 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
@@ -16,7 +16,6 @@ import com.yahoo.jdisc.handler.RequestHandler;
import com.yahoo.jdisc.handler.ResponseDispatch;
import com.yahoo.jdisc.handler.ResponseHandler;
import com.yahoo.jdisc.http.ConnectorConfig;
-import com.yahoo.jdisc.http.ConnectorConfig.Throttling;
import com.yahoo.jdisc.http.Cookie;
import com.yahoo.jdisc.http.HttpRequest;
import com.yahoo.jdisc.http.HttpResponse;
@@ -481,22 +480,6 @@ public class HttpServerTest {
assertThat(driver.close(), is(true));
}
- @Test
- public void requireThatConnectionThrottleDoesNotBlockConnectionsBelowThreshold() throws Exception {
- final TestDriver driver = TestDrivers.newConfiguredInstance(
- new EchoRequestHandler(),
- new ServerConfig.Builder(),
- new ConnectorConfig.Builder()
- .throttling(new Throttling.Builder()
- .enabled(true)
- .maxAcceptRate(10)
- .maxHeapUtilization(0.99)
- .maxConnections(10)));
- driver.client().get("/status.html")
- .expectStatusCode(is(OK));
- assertThat(driver.close(), is(true));
- }
-
private static RequestHandler mockRequestHandler() {
final RequestHandler mockRequestHandler = mock(RequestHandler.class);
when(mockRequestHandler.refer()).thenReturn(References.NOOP_REFERENCE);