Retry class-level lifecycle flakiness for JUnit5 (issue #24)

* Fixes retrying for Gradle 5.0 only, which uses the method name "classMethod" rather than "initializationError"
gradle · Jan 30, 2020 · 0d525bf · 0d525bf
1 parent 2635992
commit 0d525bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/plugin/src/main/java/org/gradle/testretry/internal/RetryTestFrameworkGenerator.java b/plugin/src/main/java/org/gradle/testretry/internal/RetryTestFrameworkGenerator.java
@@ -76,7 +76,8 @@ TestFramework createRetryingTestFramework(JvmTestExecutionSpec spec, Test testTa
             failedTests.stream()
                 .filter(failedTest -> failedTest.getClassName() != null)
                 .forEach(failedTest -> {
-                    if ("executionError".equals(failedTest.getName()) || "initializationError".equals(failedTest.getName())) {
+                    if ("classMethod".equals(failedTest.getName()) || "executionError".equals(failedTest.getName()) ||
+                        "initializationError".equals(failedTest.getName())) {
                         // failures in JUnit5 lifecycle methods yield a failure on methods of these names
                         retriedTestFilter.includeTestsMatching(failedTest.getClassName());
                     } else {

diff --git a/plugin/src/main/java/org/gradle/testretry/internal/RetryTestResultProcessor.java b/plugin/src/main/java/org/gradle/testretry/internal/RetryTestResultProcessor.java
@@ -64,6 +64,10 @@ public void started(TestDescriptorInternal descriptor, TestStartEvent testStartE
 
             // remove JUnit5 @BeforeAll/@AfterAll failures.
             nonExecutedFailedTests.remove(new TestName(descriptor.getClassName(), "initializationError"));
+
+            // ONLY for Gradle 5.0, the lifecycle method name is "classMethod"
+            // remove JUnit5 @BeforeAll/@AfterAll failures.
+            nonExecutedFailedTests.remove(new TestName(descriptor.getClassName(), "classMethod"));
         } else if(testFramework instanceof TestNGTestFramework) {
             // remove TestNG lifecycle method failures.
             nonExecutedFailedTests.remove(new TestName(descriptor.getClassName(), "lifecycle"));