summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@yahooinc.com>2022-04-21 16:38:57 +0200
committerValerij Fredriksen <valerijf@yahooinc.com>2022-04-21 16:38:57 +0200
commit768b98fbc11ae6e1a1a12413df64369cbabb9090 (patch)
tree0b939a69ba97e4fcbd6430c6632b61629545f7e4 /configserver
parent9421854a351bbcd9fe40b8263beffa530a0b828a (diff)
Update test
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/application/HttpProxyTest.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/HttpProxyTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/HttpProxyTest.java
index 80e998521a9..e3820ff99be 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/HttpProxyTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/HttpProxyTest.java
@@ -2,13 +2,13 @@
package com.yahoo.vespa.config.server.application;
import ai.vespa.http.HttpURL;
+import ai.vespa.http.HttpURL.Path;
import ai.vespa.http.HttpURL.Query;
import com.yahoo.config.model.api.HostInfo;
import com.yahoo.config.model.api.Model;
import com.yahoo.config.model.api.ServiceInfo;
import com.yahoo.config.provision.ClusterSpec;
import com.yahoo.container.jdisc.HttpResponse;
-import ai.vespa.http.HttpURL.Path;
import com.yahoo.slime.Slime;
import com.yahoo.slime.SlimeUtils;
import com.yahoo.vespa.config.server.http.HttpFetcher;
@@ -21,8 +21,6 @@ import org.mockito.ArgumentCaptor;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.URI;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
@@ -30,7 +28,6 @@ import static com.yahoo.config.model.api.container.ContainerServiceType.CLUSTERC
import static com.yahoo.vespa.config.server.application.MockModel.createServiceInfo;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
@@ -53,7 +50,7 @@ public class HttpProxyTest {
}
@Test
- public void testNormalGet() throws Exception {
+ public void testNormalGet() {
ArgumentCaptor<HttpFetcher.Params> actualParams = ArgumentCaptor.forClass(HttpFetcher.Params.class);
ArgumentCaptor<URI> actualUrl = ArgumentCaptor.forClass(URI.class);
HttpResponse response = new StaticResponse(200, "application/json", "body");
@@ -64,7 +61,7 @@ public class HttpProxyTest {
Query.parse("foo=bar"));
assertEquals(1, actualParams.getAllValues().size());
- assertEquals(2000, actualParams.getValue().readTimeoutMs);
+ assertEquals(29000, actualParams.getValue().readTimeoutMs);
assertEquals(1, actualUrl.getAllValues().size());
assertEquals(URI.create("http://" + hostname + ":" + port + "/clustercontroller-status/v1/clusterName?foo=bar"),