浏览代码

Temporarily increase Netty4RestIT timeout

Recently, we experience timeouts on our Windows build slaves for
Netty4RestIT. Until we have figured out what's going on, we
increase this test suite's timeout temporarily to ensure this
timeout does not mask other problems.
Daniel Mitterdorfer 9 年之前
父节点
当前提交
94bc489275

+ 5 - 1
modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4RestIT.java

@@ -22,12 +22,16 @@ package org.elasticsearch.http.netty4;
 import com.carrotsearch.randomizedtesting.annotations.Name;
 import com.carrotsearch.randomizedtesting.annotations.Name;
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
 
+import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
+import org.apache.lucene.util.TimeUnits;
 import org.elasticsearch.test.rest.ESClientYamlSuiteTestCase;
 import org.elasticsearch.test.rest.ESClientYamlSuiteTestCase;
 import org.elasticsearch.test.rest.RestTestCandidate;
 import org.elasticsearch.test.rest.RestTestCandidate;
 import org.elasticsearch.test.rest.parser.RestTestParseException;
 import org.elasticsearch.test.rest.parser.RestTestParseException;
 
 
 import java.io.IOException;
 import java.io.IOException;
 
 
+//TODO: This is a *temporary* workaround to ensure a timeout does not mask other problems
+@TimeoutSuite(millis = 30 * TimeUnits.MINUTE)
 public class Netty4RestIT extends ESClientYamlSuiteTestCase {
 public class Netty4RestIT extends ESClientYamlSuiteTestCase {
 
 
     public Netty4RestIT(@Name("yaml") RestTestCandidate testCandidate) {
     public Netty4RestIT(@Name("yaml") RestTestCandidate testCandidate) {
@@ -39,4 +43,4 @@ public class Netty4RestIT extends ESClientYamlSuiteTestCase {
         return ESClientYamlSuiteTestCase.createParameters(0, 1);
         return ESClientYamlSuiteTestCase.createParameters(0, 1);
     }
     }
 
 
-}
+}