Update to use built-in gradle retry

Signed-off-by: Hal Spang <[email protected]>

Author: halspang

client/build.gradle

@@ -6,6 +6,7 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'com.github.spotbugs' version '5.2.1'
+    id 'org.gradle.test-retry' version '1.4.1'
 }
 
 group 'com.microsoft'
@@ -110,6 +111,11 @@ test {
         // and require external dependencies.
         excludeTags "integration"
     }
+    
+    retry {
+        maxRetries = 2
+        maxFailures = 5
+    }
 }
 
 // Unlike normal unit tests, some tests are considered "integration tests" and shouldn't be
@@ -125,6 +131,12 @@ task integrationTest(type: Test) {
     testLogging.showStandardStreams = true
 
     ignoreFailures = false
+    
+    // Add retry capability for flaky integration tests
+    retry {
+        maxRetries = 3
+        maxFailures = 10
+    }
 }
 
 publishing {

client/src/test/java/com/microsoft/durabletask/ErrorHandlingIntegrationTests.java

@@ -7,7 +7,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import java.time.Duration;
 import java.util.concurrent.TimeoutException;
@@ -25,7 +24,6 @@
  * client operations and sends invocation instructions to the DurableTaskWorker).
  */
 @Tag("integration")
-@ExtendWith(TestRetryExtension.class)
 public class ErrorHandlingIntegrationTests extends IntegrationTestBase {
 
     @BeforeEach
@@ -198,7 +196,7 @@ void subOrchestrationException(boolean handleException) throws TimeoutException
     @ValueSource(ints = {1, 2, 10})
     public void retrySubOrchestratorFailures(int maxNumberOfAttempts) throws TimeoutException {
         // There is one task for each sub-orchestrator call and one task between each retry
-        int expectedTaskCount = (maxNumberOfAttempts * 2);
+        int expectedTaskCount = (maxNumberOfAttempts * 2) - 1;
         this.retryOnFailuresCoreTest(maxNumberOfAttempts, expectedTaskCount, ctx -> {
                 RetryPolicy retryPolicy = getCommonRetryPolicy(maxNumberOfAttempts);
                 ctx.callSubOrchestrator(

client/src/test/java/com/microsoft/durabletask/IntegrationTests.java

@@ -19,7 +19,6 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -34,7 +33,6 @@
  * sends invocation instructions to the DurableTaskWorker).
  */
 @Tag("integration")
-@ExtendWith(TestRetryExtension.class)
 public class IntegrationTests extends IntegrationTestBase {
     static final Duration defaultTimeout = Duration.ofSeconds(100);
     // All tests that create a server should save it to this variable for proper shutdown