remove randomized non-403 retry testing: predicate no longer falls back to default retry logic, separate now

Author: DiannaHohensee

modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3ServiceTests.java

@@ -31,7 +31,6 @@
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static org.hamcrest.CoreMatchers.equalTo;
 import static org.mockito.Mockito.mock;
 
 public class S3ServiceTests extends ESTestCase {
@@ -82,23 +81,11 @@ public void testRetryOn403RetryPolicy() {
             )
         );
 
-        if (randomBoolean()) {
-            // Random for another error status that is not 403
-            var non403StatusCode = randomValueOtherThan(403, () -> between(0, 600));
-            var non403Exception = S3Exception.builder().statusCode(non403StatusCode).awsErrorDetails(awsErrorDetails).build();
-            var retryPolicyContext = RetryPolicyContext.builder().retriesAttempted(between(0, 9)).exception(non403Exception).build();
-            // Retryable 403 condition delegates to the AWS default retry condition. Its result must be consistent with the decision
-            // by the AWS default, e.g. some error status like 429 is retryable by default, the retryable 403 condition respects it.
-            boolean actual = S3Service.RETRYABLE_403_PREDICATE(retryPolicyContext.exception());
-            boolean expected = RetryCondition.defaultRetryCondition().shouldRetry(retryPolicyContext);
-            assertThat(actual, equalTo(expected));
-        } else {
-            // Not retry for 403 with error code that is not invalid access key id
-            String errorCode = randomAlphaOfLength(10);
-            var exception = S3Exception.builder().awsErrorDetails(AwsErrorDetails.builder().errorCode(errorCode).build()).build();
-            var retryPolicyContext = RetryPolicyContext.builder().retriesAttempted(between(0, 9)).exception(exception).build();
-            assertFalse(S3Service.RETRYABLE_403_PREDICATE(retryPolicyContext.exception()));
-        }
+        // Not retry for 403 with error code that is not invalid access key id
+        String errorCode = randomAlphaOfLength(10);
+        var exception = S3Exception.builder().awsErrorDetails(AwsErrorDetails.builder().errorCode(errorCode).build()).build();
+        var retryPolicyContext = RetryPolicyContext.builder().retriesAttempted(between(0, 9)).exception(exception).build();
+        assertFalse(S3Service.RETRYABLE_403_PREDICATE(retryPolicyContext.exception()));
     }
 
     @TestLogging(reason = "testing WARN log output", value = "org.elasticsearch.repositories.s3.S3Service:WARN")