Skip to content

Commit 33571bc

Browse files
committed
Increase timeout for s3 upload regression tests
1 parent c2ebd70 commit 33571bc

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadAsyncRegressionTesting.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccessPointWithPathStyle;
2020
import static software.amazon.awssdk.services.s3.regression.S3ClientFlavor.STANDARD_ASYNC;
2121

22-
import java.time.Duration;
23-
import java.time.temporal.ChronoUnit;
2422
import java.util.List;
2523
import java.util.Optional;
2624
import java.util.concurrent.TimeUnit;
@@ -79,7 +77,7 @@ void putObject(UploadConfig config) throws Exception {
7977
ClientOverrideConfiguration.Builder overrideConfiguration =
8078
ClientOverrideConfiguration.builder()
8179
.addExecutionInterceptor(recorder)
82-
.apiCallTimeout(Duration.of(30, ChronoUnit.SECONDS));
80+
.apiCallTimeout(API_CALL_TIMEOUT);
8381

8482
if (config.isPayloadSigning()) {
8583
overrideConfiguration.addExecutionInterceptor(new EnablePayloadSigningInterceptor());

test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadStreamingRegressionTesting.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.nio.charset.StandardCharsets;
3131
import java.nio.file.Files;
3232
import java.nio.file.Path;
33+
import java.time.Duration;
3334
import java.util.ArrayList;
3435
import java.util.Arrays;
3536
import java.util.List;
@@ -76,6 +77,7 @@ public class UploadStreamingRegressionTesting extends BaseS3RegressionTest {
7677
private static final Logger LOG = Logger.loggerFor(UploadStreamingRegressionTesting.class);
7778

7879
private static final ExecutorService ASYNC_REQUEST_BODY_EXECUTOR = Executors.newSingleThreadExecutor();
80+
static final Duration API_CALL_TIMEOUT = Duration.ofMinutes(1);
7981

8082
static final byte[] smallContent = "Hello world".getBytes(StandardCharsets.UTF_8);
8183
static final byte[] largeContent = largeContent();

test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadSyncRegressionTesting.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import static org.assertj.core.api.Assertions.assertThat;
1919
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccessPointWithPathStyle;
2020

21-
import java.time.Duration;
22-
import java.time.temporal.ChronoUnit;
2321
import java.util.List;
2422
import java.util.Optional;
2523
import java.util.concurrent.TimeUnit;
@@ -76,7 +74,7 @@ void putObject(UploadConfig config) throws Exception {
7674
ClientOverrideConfiguration.Builder overrideConfiguration =
7775
ClientOverrideConfiguration.builder()
7876
.addExecutionInterceptor(recorder)
79-
.apiCallTimeout(Duration.of(30, ChronoUnit.SECONDS));
77+
.apiCallTimeout(API_CALL_TIMEOUT);
8078

8179
if (config.isPayloadSigning()) {
8280
overrideConfiguration.addExecutionInterceptor(new EnablePayloadSigningInterceptor());

0 commit comments

Comments
 (0)