Skip to content

Increase timeout for s3 upload regression tests #6601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −6
Open

Increase timeout for s3 upload regression tests #6601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...va/software/amazon/awssdk/services/s3/regression/upload/UploadAsyncRegressionTesting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccessPointWithPathStyle;
import static software.amazon.awssdk.services.s3.regression.S3ClientFlavor.STANDARD_ASYNC;

import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -79,7 +77,7 @@ void putObject(UploadConfig config) throws Exception {
ClientOverrideConfiguration.Builder overrideConfiguration =
ClientOverrideConfiguration.builder()
.addExecutionInterceptor(recorder)
.apiCallTimeout(Duration.of(30, ChronoUnit.SECONDS));
.apiCallTimeout(API_CALL_TIMEOUT);

if (config.isPayloadSigning()) {
overrideConfiguration.addExecutionInterceptor(new EnablePayloadSigningInterceptor());
Expand Down
2 changes: 2 additions & 0 deletions ...oftware/amazon/awssdk/services/s3/regression/upload/UploadStreamingRegressionTesting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -76,6 +77,7 @@ public class UploadStreamingRegressionTesting extends BaseS3RegressionTest {
private static final Logger LOG = Logger.loggerFor(UploadStreamingRegressionTesting.class);

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

static final byte[] smallContent = "Hello world".getBytes(StandardCharsets.UTF_8);
static final byte[] largeContent = largeContent();
Expand Down
4 changes: 1 addition & 3 deletions ...ava/software/amazon/awssdk/services/s3/regression/upload/UploadSyncRegressionTesting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import static org.assertj.core.api.Assertions.assertThat;
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccessPointWithPathStyle;

import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -76,7 +74,7 @@ void putObject(UploadConfig config) throws Exception {
ClientOverrideConfiguration.Builder overrideConfiguration =
ClientOverrideConfiguration.builder()
.addExecutionInterceptor(recorder)
.apiCallTimeout(Duration.of(30, ChronoUnit.SECONDS));
.apiCallTimeout(API_CALL_TIMEOUT);

if (config.isPayloadSigning()) {
overrideConfiguration.addExecutionInterceptor(new EnablePayloadSigningInterceptor());
Expand Down
Loading