diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-07-25 10:44:34 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-07-25 10:44:34 +0200 |
commit | 69802db6723489ebc76907e8bdb8ad7b80393231 (patch) | |
tree | ecc51033f5a79f2cb8bee1141f84886fcefea644 /configserver/src | |
parent | 29a0aa78101c9bb16dd2386438721e8128362f06 (diff) |
Increase timeout to stabilize test
Diffstat (limited to 'configserver/src')
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java index 800be763092..71ae6955e56 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java @@ -40,6 +40,7 @@ import static org.junit.Assert.assertTrue; */ public class ConfigConvergenceCheckerTest { + private static final Duration clientTimeout = Duration.ofSeconds(10); private final TenantName tenant = TenantName.from("mytenant"); private final ApplicationId appId = ApplicationId.from(tenant, ApplicationName.from("myapp"), InstanceName.from("myinstance")); @@ -76,7 +77,7 @@ public class ConfigConvergenceCheckerTest { String serviceName = hostAndPort(this.service); URI requestUrl = testServer().resolve("/serviceconverge/" + serviceName); wireMock.stubFor(get(urlEqualTo("/state/v1/config")).willReturn(okJson("{\"config\":{\"generation\":3}}"))); - HttpResponse serviceResponse = checker.checkService(application, hostAndPort(this.service), requestUrl, Duration.ofSeconds(5)); + HttpResponse serviceResponse = checker.checkService(application, hostAndPort(this.service), requestUrl, clientTimeout); assertResponse("{\n" + " \"url\": \"" + requestUrl.toString() + "\",\n" + " \"host\": \"" + hostAndPort(this.service) + "\",\n" + @@ -91,8 +92,7 @@ public class ConfigConvergenceCheckerTest { { // Missing service String serviceName = "notPresent:1337"; URI requestUrl = testServer().resolve("/serviceconverge/" + serviceName); - HttpResponse response = checker.checkService(application, "notPresent:1337", requestUrl, - Duration.ofSeconds(5)); + HttpResponse response = checker.checkService(application, "notPresent:1337", requestUrl,clientTimeout); assertResponse("{\n" + " \"url\": \"" + requestUrl.toString() + "\",\n" + " \"host\": \"" + serviceName + "\",\n" + @@ -111,7 +111,7 @@ public class ConfigConvergenceCheckerTest { URI requestUrl = testServer().resolve("/serviceconverge"); URI serviceUrl = testServer().resolve("/serviceconverge/" + serviceName); wireMock.stubFor(get(urlEqualTo("/state/v1/config")).willReturn(okJson("{\"config\":{\"generation\":3}}"))); - HttpResponse response = checker.servicesToCheck(application, requestUrl, Duration.ofSeconds(5)); + HttpResponse response = checker.servicesToCheck(application, requestUrl, clientTimeout); assertResponse("{\n" + " \"services\": [\n" + " {\n" + @@ -148,7 +148,7 @@ public class ConfigConvergenceCheckerTest { URI requestUrl = testServer().resolve("/serviceconverge"); URI serviceUrl = testServer().resolve("/serviceconverge/" + hostAndPort(service)); URI serviceUrl2 = testServer().resolve("/serviceconverge/" + hostAndPort(service2)); - HttpResponse response = checker.servicesToCheck(application, requestUrl, Duration.ofSeconds(5)); + HttpResponse response = checker.servicesToCheck(application, requestUrl, clientTimeout); assertResponse("{\n" + " \"services\": [\n" + " {\n" + @@ -180,7 +180,7 @@ public class ConfigConvergenceCheckerTest { public void service_convergence_timeout() { URI requestUrl = testServer().resolve("/serviceconverge"); wireMock.stubFor(get(urlEqualTo("/state/v1/config")).willReturn(aResponse() - .withFixedDelay((int) Duration.ofSeconds(10).toMillis()) + .withFixedDelay((int) clientTimeout.plus(Duration.ofSeconds(1)).toMillis()) .withBody("response too slow"))); HttpResponse response = checker.checkService(application, hostAndPort(service), requestUrl, Duration.ofMillis(1)); // Message contained in a SocketTimeoutException may differ across platforms, so we do a partial match of the response here |