mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '3.0.x' into 3.1.x
Closes gh-37398
This commit is contained in:
commit
d9207fcaaf
@ -179,7 +179,7 @@ class JavaConventions {
|
|||||||
|
|
||||||
private void configureTestRetries(Test test) {
|
private void configureTestRetries(Test test) {
|
||||||
TestRetryExtension testRetry = test.getExtensions().getByType(TestRetryExtension.class);
|
TestRetryExtension testRetry = test.getExtensions().getByType(TestRetryExtension.class);
|
||||||
testRetry.getFailOnPassedAfterRetry().set(true);
|
testRetry.getFailOnPassedAfterRetry().set(false);
|
||||||
testRetry.getMaxRetries().set(isCi() ? 3 : 0);
|
testRetry.getMaxRetries().set(isCi() ? 3 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -187,7 +187,7 @@ class ConventionsPluginTests {
|
|||||||
}
|
}
|
||||||
assertThat(runGradle(Collections.singletonMap("CI", "true"), "retryConfig", "--stacktrace").getOutput())
|
assertThat(runGradle(Collections.singletonMap("CI", "true"), "retryConfig", "--stacktrace").getOutput())
|
||||||
.contains("maxRetries: 3")
|
.contains("maxRetries: 3")
|
||||||
.contains("failOnPassedAfterRetry: true");
|
.contains("failOnPassedAfterRetry: false");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@ -209,7 +209,7 @@ class ConventionsPluginTests {
|
|||||||
}
|
}
|
||||||
assertThat(runGradle(Collections.singletonMap("CI", "local"), "retryConfig", "--stacktrace").getOutput())
|
assertThat(runGradle(Collections.singletonMap("CI", "local"), "retryConfig", "--stacktrace").getOutput())
|
||||||
.contains("maxRetries: 0")
|
.contains("maxRetries: 0")
|
||||||
.contains("failOnPassedAfterRetry: true");
|
.contains("failOnPassedAfterRetry: false");
|
||||||
}
|
}
|
||||||
|
|
||||||
private BuildResult runGradle(String... args) {
|
private BuildResult runGradle(String... args) {
|
||||||
|
Loading…
Reference in New Issue
Block a user