Increase tool timeout to reduce flakiness

junit-team · Nov 1, 2021 · 938ab00 · 938ab00
1 parent cd257bd
commit 938ab00
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java b/platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java
@@ -15,6 +15,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -33,6 +34,8 @@
  */
 public class Helper {
 
+ public static final Duration TOOL_TIMEOUT = Duration.ofMinutes(3);
+
  private static final Path ROOT = Paths.get("..");
  private static final Path GRADLE_PROPERTIES = ROOT.resolve("gradle.properties");
  private static final Path SETTINGS_GRADLE = ROOT.resolve("settings.gradle.kts");

diff --git a/...pport-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java b/...pport-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
@@ -13,8 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.time.Duration;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import de.sormuras.bartholdy.tool.GradleWrapper;
 
@@ -37,7 +36,7 @@ void gradle_wrapper() {
  .setProject("gradle-kotlin-extensions") //
  .addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
  .addArguments("build", "--no-daemon", "--stacktrace") //
- .setTimeout(Duration.ofMinutes(2)) //
+ .setTimeout(TOOL_TIMEOUT) //
  .setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
  .build() //
  .run();

diff --git a/...-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java b/...-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
@@ -13,9 +13,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import java.nio.file.Paths;
-import java.time.Duration;
 import java.util.List;
 
 import de.sormuras.bartholdy.Tool;
@@ -47,7 +47,7 @@ private void test(Tool gradle) {
  .addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
  .addArguments("build", "--no-daemon", "--debug", "--stacktrace") //
  .setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
- .setTimeout(Duration.ofMinutes(2)).build() //
+ .setTimeout(TOOL_TIMEOUT).build() //
  .run();
 
  assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);

diff --git a/...ooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java b/...ooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
@@ -14,9 +14,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import java.nio.file.Paths;
-import java.time.Duration;
 
 import de.sormuras.bartholdy.tool.GradleWrapper;
 
@@ -39,7 +39,7 @@ void gradle_wrapper() {
  .setProject("gradle-starter") //
  .addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
  .addArguments("build", "--no-daemon", "--stacktrace") //
- .setTimeout(Duration.ofMinutes(2)) //
+ .setTimeout(TOOL_TIMEOUT) //
  .setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
  .build() //
  .run();

diff --git a/...tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java b/...tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java
@@ -14,9 +14,9 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import java.nio.file.Path;
-import java.time.Duration;
 import java.util.List;
 
 import de.sormuras.bartholdy.tool.Java;
@@ -55,7 +55,7 @@ List<String> execute(String version, Path javaHome) {
  .setWorkspace("java-versions-" + version) //
  .addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
  .addArguments("--debug", "--batch-mode", "verify") //
- .setTimeout(Duration.ofMinutes(2)) //
+ .setTimeout(TOOL_TIMEOUT) //
  .setJavaHome(javaHome) //
  .build().run();
  assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);

diff --git a/...tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java b/...tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
@@ -14,8 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.time.Duration;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import org.junit.jupiter.api.Test;
 import org.opentest4j.TestAbortedException;
@@ -36,7 +35,7 @@ void verifyMavenStarterProject() {
  .setProject("maven-starter") //
  .addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
  .addArguments("--debug", "--batch-mode", "verify") //
- .setTimeout(Duration.ofMinutes(2)) //
+ .setTimeout(TOOL_TIMEOUT) //
  .setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
  .build() //
  .run();

diff --git a/...ling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java b/...ling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java
@@ -14,10 +14,10 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.time.Duration;
 import java.util.List;
 
 import de.sormuras.bartholdy.Result;
@@ -85,7 +85,7 @@ private Result mvn(String variant) {
  .setProject("multi-release-jar") //
  .addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
  .addArguments("--show-version", "--errors", "--batch-mode", "--file", variant, "test") //
- .setTimeout(Duration.ofMinutes(2)) //
+ .setTimeout(TOOL_TIMEOUT) //
  .build() //
  .run();
 

diff --git a/...ort-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java b/...ort-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
@@ -12,9 +12,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import java.nio.file.Paths;
-import java.time.Duration;
 
 import de.sormuras.bartholdy.Result;
 import de.sormuras.bartholdy.tool.GradleWrapper;
@@ -63,7 +63,7 @@ private Result run(String version) {
  .addArguments("build", "--no-daemon", "--stacktrace") //
  .addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
  .addArguments("-Djunit4Version=" + version) //
- .setTimeout(Duration.ofMinutes(2)) //
+ .setTimeout(TOOL_TIMEOUT) //
  .build() //
  .run();
  assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);

diff --git a/...port-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java b/...port-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java
@@ -12,8 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-
-import java.time.Duration;
+import static platform.tooling.support.Helper.TOOL_TIMEOUT;
 
 import de.sormuras.bartholdy.Result;
 
@@ -63,7 +62,7 @@ private Result run(String version) {
  .addArguments("clean", "test", "--debug", "--batch-mode") //
  .addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
  .addArguments("-Djunit4Version=" + version) //
- .setTimeout(Duration.ofMinutes(2)) //
+ .setTimeout(TOOL_TIMEOUT) //
  .build() //
  .run();
  assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);