From 0aa783fc234e5160b60bc617091768806cbe551d Mon Sep 17 00:00:00 2001 From: Luca Cavanna Date: Wed, 27 Mar 2019 14:10:10 +0100 Subject: [PATCH 1/2] Increase suite timeout to 30 minutes for docs tests I have been hitting the suite timeout on `DocsClientYamlTestSuiteIT`. As far as I can see, the docs tests are taking quite a while, I assume it's because more and more docs snippets get added over time, which means more tests. The current suite timeout is the default 20 minutes. It takes me just a little less than 20 minutes to run these on my laptop. On my CI, I end up hitting the suite timeout. Hereby I propose that we increase the suite timeout to 30 minutes. --- .../smoketest/DocsClientYamlTestSuiteIT.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java b/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java index b4a6c49754869..02ed3e426483e 100644 --- a/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java +++ b/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java @@ -19,11 +19,12 @@ package org.elasticsearch.smoketest; -import org.apache.http.HttpHost; -import org.apache.lucene.util.BytesRef; - import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; +import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; +import org.apache.http.HttpHost; +import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.TimeUnits; import org.elasticsearch.Version; import org.elasticsearch.client.RestClient; import org.elasticsearch.common.ParseField; @@ -48,12 +49,12 @@ import java.util.List; import java.util.Map; -import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; - import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; +import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; +@TimeoutSuite(millis = 30 * TimeUnits.MINUTE) public class DocsClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { public DocsClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { From 9077f969a77e7624ede0851069a2de20f7ca3ed4 Mon Sep 17 00:00:00 2001 From: Luca Cavanna Date: Wed, 27 Mar 2019 15:55:17 +0100 Subject: [PATCH 2/2] add comment --- .../org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java b/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java index 02ed3e426483e..bbc6a64dcdb2b 100644 --- a/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java +++ b/docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java @@ -54,6 +54,7 @@ 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) public class DocsClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {