Skip to content

Commit 44d7185

Browse files
committed
Always increase timeout for packaging tests (#48945)
The previous approach did not work because the system property is passed to Gradle but not to the tests JVM. We shouldn't really pass this to the tests as we wouldn't want to have differences. This timeout being different might not be bad, but having a way to differentiate could lead to others and it's best avoided.
1 parent 4440a82 commit 44d7185

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

qa/os/src/test/java/org/elasticsearch/packaging/util/ServerUtils.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,8 @@ public class ServerUtils {
3838
protected static final Logger logger = LogManager.getLogger(ServerUtils.class);
3939

4040
// generous timeout as nested virtualization can be quite slow ...
41-
private static final long waitTime = TimeUnit.MINUTES.toMillis(
42-
System.getProperty("tests.inVM") == null ? 3 : 1
43-
);
44-
private static final long timeoutLength = TimeUnit.SECONDS.toMillis(
45-
System.getProperty("tests.inVM") == null ? 30 : 10
46-
);
41+
private static final long waitTime = TimeUnit.MINUTES.toMillis(3);
42+
private static final long timeoutLength = TimeUnit.SECONDS.toMillis(30);
4743

4844
public static void waitForElasticsearch(Installation installation) throws IOException {
4945
waitForElasticsearch("green", null, installation);

0 commit comments

Comments
 (0)