Skip to content

Commit 3b508b3

Browse files
committed
Fix failing s3 regression tests for MRAP
1 parent c044542 commit 3b508b3

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,11 @@ public static void assumeNotAccessPointWithPathStyle(UploadConfig config) {
203203
"Path style doesn't work with ARN type buckets");
204204
}
205205

206+
public static void assumeNotMRAP(UploadConfig config) {
207+
Assumptions.assumeFalse(config.getBucketType().equals(BucketType.MRAP),
208+
"MRAP buckets are not supported by TransferManager.");
209+
}
210+
206211
public static String crc32(String s) {
207212
return crc32(s.getBytes(StandardCharsets.UTF_8));
208213
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void putObject(UploadConfig config) throws Exception {
7979
ClientOverrideConfiguration.Builder overrideConfiguration =
8080
ClientOverrideConfiguration.builder()
8181
.addExecutionInterceptor(recorder)
82-
.apiCallTimeout(Duration.of(30, ChronoUnit.SECONDS));
82+
.apiCallTimeout(Duration.of(90, ChronoUnit.SECONDS));
8383

8484
if (config.isPayloadSigning()) {
8585
overrideConfiguration.addExecutionInterceptor(new EnablePayloadSigningInterceptor());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package software.amazon.awssdk.services.s3.regression.upload;
1717

1818
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccessPointWithPathStyle;
19+
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotMRAP;
1920
import static software.amazon.awssdk.services.s3.regression.S3ClientFlavor.MULTIPART_ENABLED;
2021

2122
import java.time.Duration;
@@ -48,6 +49,7 @@ public static List<UploadConfig> testConfigs() {
4849
void putObject(UploadConfig config) throws Exception {
4950

5051
assumeNotAccessPointWithPathStyle(config);
52+
assumeNotMRAP(config);
5153

5254
// For testing purposes, ContentProvider is Publisher<ByteBuffer> for async clients
5355
// There is no way to create AsyncRequestBody with a Publisher<ByteBuffer> and also provide the content length
@@ -99,6 +101,4 @@ void putObject(UploadConfig config) throws Exception {
99101
}
100102
}
101103
}
102-
103-
104104
}

0 commit comments

Comments
 (0)