Skip to content

Commit 23dea4a

Browse files
committed
Remove CrtResource.waitForNoResources() from integration tests because it increases test time and makes tests flaky especially when tests are running in parallel. We still verify it in wiremock tests and stability tests
1 parent 24b5bba commit 23dea4a

9 files changed

+10
-7
lines changed

services/s3/src/it/java/software/amazon/awssdk/services/SelectObjectContentIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static void teardown() {
7777
} finally {
7878
s3AsyncClients().forEach(SdkAutoCloseable::close);
7979
s3.close();
80-
CrtResource.waitForNoResources();
80+
8181
}
8282
}
8383

services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/ChecksumIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public static void teardown() throws IOException {
6666
S3IntegrationTestBase.deleteBucketAndAllContents(TEST_BUCKET);
6767
Files.delete(testFile.toPath());
6868
s3Crt.close();
69-
CrtResource.waitForNoResources();
69+
7070
}
7171

7272
@Test

services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/CrtExceptionTransformationIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static void setupFixture() throws Exception {
6161
public static void tearDownFixture() {
6262
S3IntegrationTestBase.deleteBucketAndAllContents(BUCKET);
6363
s3Crt.close();
64-
CrtResource.waitForNoResources();
64+
6565
}
6666

6767
@Test

services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/S3CrossRegionCrtIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public static void cleanup() {
8484
crtClient.close();
8585
S3IntegrationTestBase.deleteBucketAndAllContents(BUCKET);
8686
executorService.shutdown();
87-
CrtResource.waitForNoResources();
87+
8888
}
8989

9090
@Test

services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/S3CrtClientPutObjectIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public static void teardown() throws IOException {
7474
S3IntegrationTestBase.deleteBucketAndAllContents(TEST_BUCKET);
7575
Files.delete(testFile.toPath());
7676
s3Crt.close();
77-
CrtResource.waitForNoResources();
77+
7878
}
7979

8080
@Test

services/s3/src/it/java/software/amazon/awssdk/services/s3/crt/S3CrtGetObjectIntegrationTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public static void cleanup() {
6666
crtClient.close();
6767
S3IntegrationTestBase.deleteBucketAndAllContents(BUCKET);
6868
executorService.shutdown();
69-
CrtResource.waitForNoResources();
7069
}
7170

7271
@Test

services/s3/src/it/java/software/amazon/awssdk/services/s3/crthttpclient/S3WithCrtHttpClientsIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static void teardown() throws IOException {
5858
S3IntegrationTestBase.deleteBucketAndAllContents(TEST_BUCKET);
5959
Files.delete(testFile.toPath());
6060
s3WithCrtHttpClient.close();
61-
CrtResource.waitForNoResources();
61+
6262
}
6363

6464
@Test

services/s3/src/it/java/software/amazon/awssdk/services/s3/multipart/S3ClientMultiPartCopyIntegrationTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import software.amazon.awssdk.core.ResponseBytes;
3939
import software.amazon.awssdk.core.async.AsyncRequestBody;
4040
import software.amazon.awssdk.core.sync.ResponseTransformer;
41+
import software.amazon.awssdk.crt.CrtResource;
4142
import software.amazon.awssdk.services.s3.S3AsyncClient;
4243
import software.amazon.awssdk.services.s3.S3IntegrationTestBase;
4344
import software.amazon.awssdk.services.s3.internal.crt.S3CrtAsyncClient;
@@ -80,6 +81,7 @@ public static void teardown() throws Exception {
8081
s3CrtAsyncClient.close();
8182
s3MpuClient.close();
8283
deleteBucketAndAllContents(BUCKET);
84+
8385
}
8486

8587
public static Stream<S3AsyncClient> s3AsyncClient() {

services/s3/src/it/java/software/amazon/awssdk/services/s3/s3express/S3ExpressIntegrationTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import software.amazon.awssdk.core.rules.testing.model.Expect;
5858
import software.amazon.awssdk.core.sync.RequestBody;
5959
import software.amazon.awssdk.core.sync.ResponseTransformer;
60+
import software.amazon.awssdk.crt.CrtResource;
6061
import software.amazon.awssdk.endpoints.Endpoint;
6162
import software.amazon.awssdk.http.SdkHttpRequest;
6263
import software.amazon.awssdk.regions.Region;
@@ -118,6 +119,7 @@ static void teardown() {
118119
s3.close();
119120
s3Async.close();
120121
s3CrtAsync.close();
122+
121123
}
122124

123125
@BeforeEach

0 commit comments

Comments
 (0)