root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.1.x' 

Closes gh-37399
This commit is contained in:
Andy Wilkinson 2023-09-15 08:37:22 +01:00
parent defe77895a d9207fcaaf
commit 827471bca4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
View File

@ -179,7 +179,7 @@ class JavaConventions {
private void configureTestRetries(Test test) {
TestRetryExtension testRetry = test.getExtensions().getByType(TestRetryExtension.class);
testRetry.getFailOnPassedAfterRetry().set(true);
testRetry.getFailOnPassedAfterRetry().set(false);
testRetry.getMaxRetries().set(isCi() ? 3 : 0);
}

4
buildSrc/src/test/java/org/springframework/boot/build/ConventionsPluginTests.java
View File

@ -187,7 +187,7 @@ class ConventionsPluginTests {
}
assertThat(runGradle(Collections.singletonMap("CI", "true"), "retryConfig", "--stacktrace").getOutput())
.contains("maxRetries: 3")
.contains("failOnPassedAfterRetry: true");
.contains("failOnPassedAfterRetry: false");
}
@Test
@ -209,7 +209,7 @@ class ConventionsPluginTests {
}
assertThat(runGradle(Collections.singletonMap("CI", "local"), "retryConfig", "--stacktrace").getOutput())
.contains("maxRetries: 0")
.contains("failOnPassedAfterRetry: true");
.contains("failOnPassedAfterRetry: false");
}
private BuildResult runGradle(String... args) {