Skip to content

Commit f608808

Browse files
committed
Fix stability tests
1 parent 768526e commit f608808

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3AsyncBaseStabilityTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ protected static void deleteBucketAndAllContents(S3AsyncClient client, String bu
183183

184184
client.deleteBucket(DeleteBucketRequest.builder().bucket(bucketName).build()).join();
185185
} catch (Exception e) {
186-
log.error(() -> "Failed to delete bucket: " +bucketName);
186+
log.error(() -> "Failed to delete bucket: " + bucketName, e);
187187
}
188188
}
189189

test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3MultipartJavaBasedStabilityTest.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515

1616
package software.amazon.awssdk.stability.tests.s3;
1717

18+
import java.time.Duration;
1819
import org.junit.jupiter.api.AfterAll;
1920
import org.junit.jupiter.api.BeforeAll;
21+
import software.amazon.awssdk.core.retry.RetryPolicy;
2022
import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
2123
import software.amazon.awssdk.services.s3.S3AsyncClient;
2224

@@ -27,7 +29,12 @@ public class S3MultipartJavaBasedStabilityTest extends S3AsyncBaseStabilityTest
2729
static {
2830
multipartJavaBasedClient = S3AsyncClient.builder()
2931
.credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
32+
.httpClientBuilder(NettyNioAsyncHttpClient.builder()
33+
.maxConcurrency(CONCURRENCY))
3034
.multipartEnabled(true)
35+
.overrideConfiguration(b -> b.apiCallTimeout(Duration.ofMinutes(5))
36+
// Retry at test level
37+
.retryPolicy(RetryPolicy.none()))
3138
.build();
3239
}
3340

@@ -37,14 +44,14 @@ public S3MultipartJavaBasedStabilityTest() {
3744

3845
@BeforeAll
3946
public static void setup() {
40-
s3ApacheClient.createBucket(b -> b.bucket(BUCKET_NAME));
47+
multipartJavaBasedClient.createBucket(b -> b.bucket(BUCKET_NAME)).join();
48+
multipartJavaBasedClient.waiter().waitUntilBucketExists(b -> b.bucket(BUCKET_NAME)).join();
4149
}
4250

4351
@AfterAll
4452
public static void cleanup() {
4553
deleteBucketAndAllContents(multipartJavaBasedClient, BUCKET_NAME);
4654
multipartJavaBasedClient.close();
47-
s3ApacheClient.close();
4855
}
4956

5057
@Override

0 commit comments

Comments
 (0)