Browse Source

Stop failing the build when tests pass after retry

Closes gh-37392
pull/37492/head
Andy Wilkinson 2 years ago
parent
commit
e8e5146beb
  1. 2
      buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
  2. 4
      buildSrc/src/test/java/org/springframework/boot/build/ConventionsPluginTests.java

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

@ -178,7 +178,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);
} }

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

@ -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…
Cancel
Save