Ignore un-retried methods if class-level failure occurred

Signed-off-by: Pavlo Shevchenko <pshevchenko@gradle.com>
gradle · Feb 23, 2023 · 7ea416d · 7ea416d
1 parent 4fd0a03
commit 7ea416d
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/plugin/src/main/java/org/gradle/testretry/internal/executer/RetryTestResultProcessor.java b/plugin/src/main/java/org/gradle/testretry/internal/executer/RetryTestResultProcessor.java
@@ -97,9 +97,21 @@ public void completed(Object testId, TestCompleteEvent testCompleteEvent) {
                     addRetry(className, name);
                 }
 
+                // class-level lifecycle failures do not guarantee that all methods that failed in the previous round will be re-executed (e.g. due to class setup failure)
+                // in this case, we retry the entire class, so we ignore method-level failures for the next round
+                // we keep all lifecycle failures from previous round to make sure we report them as passed later on
+                if (isLifecycleFailure(className, name)) {
+                    previousRoundFailedTests.remove(className, n -> {
+                        if (isLifecycleFailure(className, n)) {
+                            addRetry(className, n);
+                        }
+                        return true;
+                    });
+                }
+
                 if (isClassDescriptor(descriptor)) {
                     previousRoundFailedTests.remove(className, n -> {
-                        if (testFrameworkStrategy.isLifecycleFailureTest(testsReader, className, n)) {
+                        if (isLifecycleFailure(className, n)) {
                             emitFakePassedEvent(descriptor, testCompleteEvent, n);
                             return true;
                         } else {
@@ -114,6 +126,10 @@ public void completed(Object testId, TestCompleteEvent testCompleteEvent) {
         delegate.completed(testId, testCompleteEvent);
     }
 
+    private boolean isLifecycleFailure(String className, String name) {
+        return testFrameworkStrategy.isLifecycleFailureTest(testsReader, className, name);
+    }
+
     private void addRetry(String className, String name) {
         if (classRetryMatcher.retryWholeClass(className)) {
             currentRoundFailedTests.addClass(className);