Skip to content

Commit 938ab00

Browse files
marcphilippmarcphilipp
committed
Increase tool timeout to reduce flakiness
1 parent cd257bd commit 938ab00

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

‎platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import java.nio.file.Files;
1616
import java.nio.file.Path;
1717
import java.nio.file.Paths;
18+
import java.time.Duration;
1819
import java.util.ArrayList;
1920
import java.util.List;
2021
import java.util.Objects;
@@ -33,6 +34,8 @@
3334
*/
3435
public class Helper {
3536

37+
public static final Duration TOOL_TIMEOUT = Duration.ofMinutes(3);
38+
3639
private static final Path ROOT = Paths.get("..");
3740
private static final Path GRADLE_PROPERTIES = ROOT.resolve("gradle.properties");
3841
private static final Path SETTINGS_GRADLE = ROOT.resolve("settings.gradle.kts");

‎platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
import static org.junit.jupiter.api.Assertions.assertEquals;
1414
import static org.junit.jupiter.api.Assertions.assertFalse;
1515
import static org.junit.jupiter.api.Assertions.assertTrue;
16-
17-
import java.time.Duration;
16+
import static platform.tooling.support.Helper.TOOL_TIMEOUT;
1817

1918
import de.sormuras.bartholdy.tool.GradleWrapper;
2019

@@ -37,7 +36,7 @@ void gradle_wrapper() {
3736
.setProject("gradle-kotlin-extensions") //
3837
.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
3938
.addArguments("build", "--no-daemon", "--stacktrace") //
40-
.setTimeout(Duration.ofMinutes(2)) //
39+
.setTimeout(TOOL_TIMEOUT) //
4140
.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
4241
.build() //
4342
.run();

‎platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import static org.junit.jupiter.api.Assertions.assertEquals;
1414
import static org.junit.jupiter.api.Assertions.assertFalse;
1515
import static org.junit.jupiter.api.Assertions.assertLinesMatch;
16+
import static platform.tooling.support.Helper.TOOL_TIMEOUT;
1617

1718
import java.nio.file.Paths;
18-
import java.time.Duration;
1919
import java.util.List;
2020

2121
import de.sormuras.bartholdy.Tool;
@@ -47,7 +47,7 @@ private void test(Tool gradle) {
4747
.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
4848
.addArguments("build", "--no-daemon", "--debug", "--stacktrace") //
4949
.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
50-
.setTimeout(Duration.ofMinutes(2)).build() //
50+
.setTimeout(TOOL_TIMEOUT).build() //
5151
.run();
5252

5353
assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);

‎platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
import static org.junit.jupiter.api.Assertions.assertEquals;
1515
import static org.junit.jupiter.api.Assertions.assertFalse;
1616
import static org.junit.jupiter.api.Assertions.assertTrue;
17+
import static platform.tooling.support.Helper.TOOL_TIMEOUT;
1718

1819
import java.nio.file.Paths;
19-
import java.time.Duration;
2020

2121
import de.sormuras.bartholdy.tool.GradleWrapper;
2222

@@ -39,7 +39,7 @@ void gradle_wrapper() {
3939
.setProject("gradle-starter") //
4040
.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
4141
.addArguments("build", "--no-daemon", "--stacktrace") //
42-
.setTimeout(Duration.ofMinutes(2)) //
42+
.setTimeout(TOOL_TIMEOUT) //
4343
.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
4444
.build() //
4545
.run();

‎platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JavaVersionsTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
import static org.junit.jupiter.api.Assertions.assertFalse;
1515
import static org.junit.jupiter.api.Assertions.assertTrue;
1616
import static org.junit.jupiter.api.Assumptions.assumeTrue;
17+
import static platform.tooling.support.Helper.TOOL_TIMEOUT;
1718

1819
import java.nio.file.Path;
19-
import java.time.Duration;
2020
import java.util.List;
2121

2222
import de.sormuras.bartholdy.tool.Java;
@@ -55,7 +55,7 @@ List<String> execute(String version, Path javaHome) {
5555
.setWorkspace("java-versions-" + version) //
5656
.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
5757
.addArguments("--debug", "--batch-mode", "verify") //
58-
.setTimeout(Duration.ofMinutes(2)) //
58+
.setTimeout(TOOL_TIMEOUT) //
5959
.setJavaHome(javaHome) //
6060
.build().run();
6161
assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);

‎platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
import static org.junit.jupiter.api.Assertions.assertEquals;
1515
import static org.junit.jupiter.api.Assertions.assertFalse;
1616
import static org.junit.jupiter.api.Assertions.assertTrue;
17-
18-
import java.time.Duration;
17+
import static platform.tooling.support.Helper.TOOL_TIMEOUT;
1918

2019
import org.junit.jupiter.api.Test;
2120
import org.opentest4j.TestAbortedException;
@@ -36,7 +35,7 @@ void verifyMavenStarterProject() {
3635
.setProject("maven-starter") //
3736
.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
3837
.addArguments("--debug", "--batch-mode", "verify") //
39-
.setTimeout(Duration.ofMinutes(2)) //
38+
.setTimeout(TOOL_TIMEOUT) //
4039
.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
4140
.build() //
4241
.run();

‎platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MultiReleaseJarTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
import static org.junit.jupiter.api.Assertions.assertFalse;
1515
import static org.junit.jupiter.api.Assertions.assertLinesMatch;
1616
import static org.junit.jupiter.api.Assertions.assertTrue;
17+
import static platform.tooling.support.Helper.TOOL_TIMEOUT;
1718

1819
import java.nio.file.Files;
1920
import java.nio.file.Path;
20-
import java.time.Duration;
2121
import java.util.List;
2222

2323
import de.sormuras.bartholdy.Result;
@@ -85,7 +85,7 @@ private Result mvn(String variant) {
8585
.setProject("multi-release-jar") //
8686
.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
8787
.addArguments("--show-version", "--errors", "--batch-mode", "--file", variant, "test") //
88-
.setTimeout(Duration.ofMinutes(2)) //
88+
.setTimeout(TOOL_TIMEOUT) //
8989
.build() //
9090
.run();
9191

‎platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
import static org.assertj.core.api.Assertions.assertThat;
1414
import static org.junit.jupiter.api.Assertions.assertFalse;
15+
import static platform.tooling.support.Helper.TOOL_TIMEOUT;
1516

1617
import java.nio.file.Paths;
17-
import java.time.Duration;
1818

1919
import de.sormuras.bartholdy.Result;
2020
import de.sormuras.bartholdy.tool.GradleWrapper;
@@ -63,7 +63,7 @@ private Result run(String version) {
6363
.addArguments("build", "--no-daemon", "--stacktrace") //
6464
.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
6565
.addArguments("-Djunit4Version=" + version) //
66-
.setTimeout(Duration.ofMinutes(2)) //
66+
.setTimeout(TOOL_TIMEOUT) //
6767
.build() //
6868
.run();
6969
assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);

‎platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageMavenIntegrationTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212

1313
import static org.assertj.core.api.Assertions.assertThat;
1414
import static org.junit.jupiter.api.Assertions.assertFalse;
15-
16-
import java.time.Duration;
15+
import static platform.tooling.support.Helper.TOOL_TIMEOUT;
1716

1817
import de.sormuras.bartholdy.Result;
1918

@@ -63,7 +62,7 @@ private Result run(String version) {
6362
.addArguments("clean", "test", "--debug", "--batch-mode") //
6463
.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
6564
.addArguments("-Djunit4Version=" + version) //
66-
.setTimeout(Duration.ofMinutes(2)) //
65+
.setTimeout(TOOL_TIMEOUT) //
6766
.build() //
6867
.run();
6968
assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy