Add failOnSkippedAfterRetry option

Signed-off-by: Alexander Boyarshinov <[email protected]>

Author: adboyarshinov

README.adoc

@@ -47,6 +47,7 @@ test {
         maxRetries = 2
         maxFailures = 20
         failOnPassedAfterRetry = true
+        failOnSkippedAfterRetry = true
     }
 }
 ----
@@ -60,6 +61,7 @@ test {
         maxRetries.set(2)
         maxFailures.set(20)
         failOnPassedAfterRetry.set(true)
+        failOnSkippedAfterRetry.set(true)
     }
 }
 ----
@@ -79,6 +81,7 @@ test {
             maxFailures = 20
         }
         failOnPassedAfterRetry = true
+        failOnSkippedAfterRetry = true
     }
 }
 ----
@@ -120,6 +123,18 @@ public interface TestRetryTaskExtension {
      */
     Property<Boolean> getFailOnPassedAfterRetry();
 
+    /**
+     * Whether tests that initially fail and then skip on retry should fail the task.
+     * <p>
+     * This setting defaults to {@code true} (for backward compatibility),
+     * which results in the task failing if any of tests skip on retry.
+     * <p>
+     * This setting has no effect if {@link Test#getIgnoreFailures()} is set to true.
+     *
+     * @return whether tests that initially fails and then skip on retry should fail the task
+     */
+    Property<Boolean> getFailOnSkippedAfterRetry();
+
     /**
      * The maximum number of times to retry an individual test.
      * <p>

plugin/src/main/java/org/gradle/testretry/TestRetryTaskExtension.java

@@ -44,6 +44,18 @@ public interface TestRetryTaskExtension {
      */
     Property<Boolean> getFailOnPassedAfterRetry();
 
+    /**
+     * Whether tests that initially fail and then skip on retry should fail the task.
+     * <p>
+     * This setting defaults to {@code true} (for backward compatibility),
+     * which results in the task failing if any of tests skip on retry.
+     * <p>
+     * This setting has no effect if {@link Test#getIgnoreFailures()} is set to true.
+     *
+     * @return whether tests that initially fails and then skip on retry should fail the task
+     */
+    Property<Boolean> getFailOnSkippedAfterRetry();
+
     /**
      * The maximum number of times to retry an individual test.
      * <p>

plugin/src/main/java/org/gradle/testretry/internal/config/DefaultTestRetryTaskExtension.java

@@ -26,6 +26,7 @@
 public class DefaultTestRetryTaskExtension implements TestRetryTaskExtension {
 
     private final Property<Boolean> failOnPassedAfterRetry;
+    private final Property<Boolean> failOnSkippedAfterRetry;
     private final Property<Integer> maxRetries;
     private final Property<Integer> maxFailures;
     private final Filter filter;
@@ -35,6 +36,7 @@ public class DefaultTestRetryTaskExtension implements TestRetryTaskExtension {
     @Inject
     public DefaultTestRetryTaskExtension(ObjectFactory objects) {
         this.failOnPassedAfterRetry = objects.property(Boolean.class);
+        this.failOnSkippedAfterRetry = objects.property(Boolean.class);
         this.maxRetries = objects.property(Integer.class);
         this.maxFailures = objects.property(Integer.class);
         this.filter = new FilterImpl(objects);
@@ -45,6 +47,10 @@ public Property<Boolean> getFailOnPassedAfterRetry() {
         return failOnPassedAfterRetry;
     }
 
+    public Property<Boolean> getFailOnSkippedAfterRetry() {
+        return failOnSkippedAfterRetry;
+    }
+
     public Property<Integer> getMaxRetries() {
         return maxRetries;
     }

plugin/src/main/java/org/gradle/testretry/internal/config/TestRetryTaskExtensionAccessor.java

@@ -21,6 +21,8 @@ public interface TestRetryTaskExtensionAccessor {
 
     boolean getFailOnPassedAfterRetry();
 
+    boolean getFailOnSkippedAfterRetry();
+
     int getMaxRetries();
 
     int getMaxFailures();

plugin/src/main/java/org/gradle/testretry/internal/config/TestRetryTaskExtensionAdapter.java

@@ -36,6 +36,7 @@ public final class TestRetryTaskExtensionAdapter implements TestRetryTaskExtensi
     private static final int DEFAULT_MAX_RETRIES = 0;
     private static final int DEFAULT_MAX_FAILURES = 0;
     private static final boolean DEFAULT_FAIL_ON_PASSED_AFTER_RETRY = false;
+    private static final boolean DEFAULT_FAIL_ON_SKIPPED_AFTER_RETRY = true;
 
     private final ProviderFactory providerFactory;
     private final TestRetryTaskExtension extension;
@@ -98,6 +99,11 @@ public boolean getFailOnPassedAfterRetry() {
         return read(extension.getFailOnPassedAfterRetry(), DEFAULT_FAIL_ON_PASSED_AFTER_RETRY);
     }
 
+    @Override
+    public boolean getFailOnSkippedAfterRetry() {
+        return read(extension.getFailOnPassedAfterRetry(), DEFAULT_FAIL_ON_SKIPPED_AFTER_RETRY);
+    }
+
     @Override
     public int getMaxRetries() {
         return read(extension.getMaxRetries(), DEFAULT_MAX_RETRIES);

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

@@ -72,6 +72,7 @@ public void execute(JvmTestExecutionSpec spec, TestResultProcessor testResultPro
         int maxRetries = extension.getMaxRetries();
         int maxFailures = extension.getMaxFailures();
         boolean failOnPassedAfterRetry = extension.getFailOnPassedAfterRetry();
+        boolean failOnSkippedAfterRetry = extension.getFailOnPassedAfterRetry();
 
         if (maxRetries <= 0) {
             delegate.execute(spec, testResultProcessor);
@@ -106,7 +107,8 @@ public void execute(JvmTestExecutionSpec spec, TestResultProcessor testResultPro
             classRetryMatcher,
             frameworkTemplate.testsReader,
             testResultProcessor,
-            maxFailures
+            maxFailures,
+            failOnSkippedAfterRetry
         );
 
         int retryCount = 0;

plugin/src/main/java/org/gradle/testretry/internal/executer/RetryTestResultProcessor.java

@@ -47,6 +47,7 @@ final class RetryTestResultProcessor implements TestResultProcessor {
     private final TestResultProcessor delegate;
 
     private final int maxFailures;
+    private final boolean failOnSkippedAfterRetry;
     private boolean lastRetry;
     private boolean hasRetryFilteredFailures;
     private Method failureMethod;
@@ -66,14 +67,16 @@ final class RetryTestResultProcessor implements TestResultProcessor {
         ClassRetryMatcher classRetryMatcher,
         TestsReader testsReader,
         TestResultProcessor delegate,
-        int maxFailures
+        int maxFailures,
+        boolean failOnSkippedAfterRetry
     ) {
         this.testFrameworkStrategy = testFrameworkStrategy;
         this.filter = filter;
         this.classRetryMatcher = classRetryMatcher;
         this.testsReader = testsReader;
         this.delegate = delegate;
         this.maxFailures = maxFailures;
+        this.failOnSkippedAfterRetry = failOnSkippedAfterRetry;
     }
 
     @Override
@@ -108,7 +111,12 @@ public void completed(Object testId, TestCompleteEvent testCompleteEvent) {
 
                 boolean failedInPreviousRound = previousRoundFailedTests.remove(className, name);
                 if (failedInPreviousRound && testCompleteEvent.getResultType() == SKIPPED) {
-                    addRetry(descriptor);
+                    if (failOnSkippedAfterRetry) {
+                        addRetry(descriptor);
+                    } else {
+                        emitFakeSkippedEvent(descriptor, testCompleteEvent, name);
+                        return;
+                    }
                 }
 
                 // 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)
@@ -209,6 +217,14 @@ private void emitFakePassedEvent(TestDescriptorInternal parent, TestCompleteEven
         delegate.completed(syntheticTestId, new TestCompleteEvent(timestamp));
     }
 
+    private void emitFakeSkippedEvent(TestDescriptorInternal parent, TestCompleteEvent parentEvent, String name) {
+        Object syntheticTestId = new Object();
+        TestDescriptorInternal syntheticDescriptor = new TestDescriptorImpl(syntheticTestId, parent, name);
+        long timestamp = parentEvent.getEndTime();
+        delegate.started(syntheticDescriptor, new TestStartEvent(timestamp, parent.getId()));
+        delegate.completed(syntheticTestId, new TestCompleteEvent(timestamp, SKIPPED));
+    }
+
     private boolean isClassDescriptor(TestDescriptorInternal descriptor) {
         return descriptor.getClassName() != null && descriptor.getClassName().equals(descriptor.getName());
     }