Skip to content

Commit 1d75e68

Browse files
committed
Handle no retry and only successful tests case
Fixes #38
1 parent e7c436f commit 1d75e68

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

plugin/src/main/java/org/gradle/testretry/internal/RetryTestExecuter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void execute(JvmTestExecutionSpec spec, TestResultProcessor testResultPro
8282
}
8383

8484
void failWithNonRetriedTestsIfAny() {
85-
if (extension.getSimulateNotRetryableTest() || !lastResult.nonRetriedTests.isEmpty()) {
85+
if (extension.getSimulateNotRetryableTest() || (lastResult != null && !lastResult.nonRetriedTests.isEmpty())) {
8686
throw new IllegalStateException("org.gradle.test-retry was unable to retry the following test methods, which is unexpected. Please file a bug report at https://github.com/gradle/test-retry-gradle-plugin/issues" +
8787
lastResult.nonRetriedTests.stream()
8888
.map(retry -> " " + retry.getClassName() + "#" + retry.getName())

plugin/src/test/groovy/org/gradle/testretry/CorePluginFuncTest.groovy

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,33 @@ class CorePluginFuncTest extends AbstractGeneralPluginFuncTest {
3939
gradleVersion << GRADLE_VERSIONS_UNDER_TEST
4040
}
4141
42+
@Unroll
43+
def "is benign when unconfigured (gradle version #gradleVersion)"() {
44+
when:
45+
successfulTest()
46+
gradleRunner(gradleVersion).build()
47+
48+
then:
49+
assertTestReportContains("SuccessfulTests", reportedTestName("successTest"), 1, 0)
50+
51+
where:
52+
gradleVersion << GRADLE_VERSIONS_UNDER_TEST
53+
}
54+
55+
@Unroll
56+
def "does not retry by default (gradle version #gradleVersion)"() {
57+
when:
58+
failedTest()
59+
def result = gradleRunner(gradleVersion).buildAndFail()
60+
61+
then:
62+
result.output.contains("There were failing tests.")
63+
assertTestReportContains("FailedTests", reportedTestName("failedTest"), 0, 1)
64+
65+
where:
66+
gradleVersion << GRADLE_VERSIONS_UNDER_TEST
67+
}
68+
4269
@Unroll
4370
def "retries failed tests (gradle version #gradleVersion)"() {
4471
given:

0 commit comments

Comments
 (0)