From bce93b93b20ea533a79f5ca60baded8df75b0262 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 13 Aug 2020 21:21:24 -0700 Subject: [PATCH] Increase docs and client rest test timeouts for Darwin (#61075) The Darwin CI hosts continue to struggle with timeouts. This commit increases the timouts for docs and client rest tests. relates #58286 --- .../elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java | 4 ++-- .../org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java b/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java index 0850653cdb06e..8f1fe57d22a95 100644 --- a/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java +++ b/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java @@ -59,8 +59,8 @@ import static java.util.Collections.singletonMap; import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; -//The default 20 minutes timeout isn't always enough, please do not increase further than 30 before analyzing what makes this suite so slow -@TimeoutSuite(millis = 30 * TimeUnits.MINUTE) +//The default 20 minutes timeout isn't always enough, but Darwin CI hosts are incredibly slow... +@TimeoutSuite(millis = 40 * TimeUnits.MINUTE) public class DocsClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { public DocsClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { diff --git a/rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java b/rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java index 51c102c028a7a..12773cf59e4a2 100644 --- a/rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java +++ b/rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java @@ -21,10 +21,15 @@ import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; +import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; +import org.apache.lucene.util.TimeUnits; import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; /** Rest integration test. Runs against a cluster started by {@code gradle integTest} */ + +//The default 20 minutes timeout isn't always enough, but Darwin CI hosts are incredibly slow... +@TimeoutSuite(millis = 40 * TimeUnits.MINUTE) public class ClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { public ClientYamlTestSuiteIT(ClientYamlTestCandidate testCandidate) { super(testCandidate);