Skip to content

Commit ce6691b

Browse files
authored
Remove CrtResource.waitForNoResources because it's too flaky (#5446)
1 parent d0c9512 commit ce6691b

File tree

6 files changed

+0
-47
lines changed

6 files changed

+0
-47
lines changed

http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClientWireMockTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@ public static void setup() {
5656
Log.initLoggingToStdout(Log.LogLevel.Warn);
5757
}
5858

59-
@AfterClass
60-
public static void tearDown() {
61-
// Verify there is no resource leak.
62-
CrtResource.waitForNoResources();
63-
}
64-
6559
@Test
6660
public void closeClient_reuse_throwException() {
6761
SdkAsyncHttpClient client = AwsCrtAsyncHttpClient.create();

services/s3/src/test/java/software/amazon/awssdk/services/s3/crt/CrtDownloadErrorTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,12 @@
2727
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
2828
import java.net.URI;
2929
import java.nio.charset.StandardCharsets;
30-
import org.junit.jupiter.api.AfterAll;
3130
import org.junit.jupiter.api.AfterEach;
3231
import org.junit.jupiter.api.BeforeAll;
3332
import org.junit.jupiter.api.BeforeEach;
3433
import org.junit.jupiter.api.Test;
3534
import org.junit.jupiter.api.Timeout;
3635
import software.amazon.awssdk.core.async.AsyncResponseTransformer;
37-
import software.amazon.awssdk.crt.CrtResource;
3836
import software.amazon.awssdk.crt.Log;
3937
import software.amazon.awssdk.regions.Region;
4038
import software.amazon.awssdk.services.s3.S3AsyncClient;
@@ -68,12 +66,6 @@ public void tearDown() {
6866
s3.close();
6967
}
7068

71-
@AfterAll
72-
public static void verifyCrtResource() {
73-
CrtResource.waitForNoResources();
74-
}
75-
76-
7769
@Test
7870
public void getObject_headObjectOk_getObjectThrows_operationThrows() {
7971
String path = String.format("/%s/%s", BUCKET, KEY);

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/CrtCredentialProviderAdapterTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@
2121

2222
import java.nio.charset.StandardCharsets;
2323
import java.util.concurrent.CompletableFuture;
24-
import org.junit.jupiter.api.AfterAll;
2524
import org.junit.jupiter.api.Test;
2625
import org.mockito.Mockito;
2726
import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
2827
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
2928
import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
3029
import software.amazon.awssdk.auth.credentials.HttpCredentialsProvider;
3130
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
32-
import software.amazon.awssdk.crt.CrtResource;
3331
import software.amazon.awssdk.crt.auth.credentials.Credentials;
3432
import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider;
3533
import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
@@ -38,10 +36,6 @@
3836

3937
public class CrtCredentialProviderAdapterTest {
4038

41-
@AfterAll
42-
public static void verifyCrtResource() {
43-
CrtResource.waitForNoResources();
44-
}
4539
@Test
4640
void crtCredentials_withSession_shouldConvert() {
4741
IdentityProvider<? extends AwsCredentialsIdentity> awsCredentialsProvider = StaticCredentialsProvider

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/DefaultS3CrtAsyncClientTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import static org.assertj.core.api.Assertions.assertThatThrownBy;
2020

2121
import java.util.concurrent.atomic.AtomicReference;
22-
import org.junit.jupiter.api.AfterAll;
23-
import org.junit.jupiter.api.AfterEach;
2422
import org.junit.jupiter.api.Test;
2523
import org.junit.jupiter.params.ParameterizedTest;
2624
import org.junit.jupiter.params.provider.ValueSource;
@@ -31,7 +29,6 @@
3129
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
3230
import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
3331
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
34-
import software.amazon.awssdk.crt.CrtResource;
3532
import software.amazon.awssdk.services.s3.DelegatingS3AsyncClient;
3633
import software.amazon.awssdk.services.s3.S3AsyncClient;
3734
import software.amazon.awssdk.services.s3.endpoints.S3ClientContextParams;
@@ -40,11 +37,6 @@
4037

4138
class DefaultS3CrtAsyncClientTest {
4239

43-
@AfterAll
44-
public static void verifyCrtResource() {
45-
CrtResource.waitForNoResources();
46-
}
47-
4840
@Test
4941
void requestSignerOverrideProvided_shouldThrowException() {
5042
try (S3AsyncClient s3AsyncClient = S3CrtAsyncClient.builder().build()) {

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtClientGetObjectResourceManagementTest.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
import static com.github.tomakehurst.wiremock.client.WireMock.get;
2222
import static com.github.tomakehurst.wiremock.client.WireMock.head;
2323
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
24-
import static org.assertj.core.api.Assertions.assertThat;
25-
import static org.mockito.ArgumentMatchers.any;
26-
import static org.mockito.Mockito.verify;
2724

2825
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
2926
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
@@ -32,7 +29,6 @@
3229
import java.net.URI;
3330
import java.util.concurrent.CompletableFuture;
3431
import org.assertj.core.util.Files;
35-
import org.junit.jupiter.api.AfterAll;
3632
import org.junit.jupiter.api.AfterEach;
3733
import org.junit.jupiter.api.BeforeAll;
3834
import org.junit.jupiter.api.BeforeEach;
@@ -42,7 +38,6 @@
4238
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
4339
import software.amazon.awssdk.core.ResponseInputStream;
4440
import software.amazon.awssdk.core.async.AsyncResponseTransformer;
45-
import software.amazon.awssdk.crt.CrtResource;
4641
import software.amazon.awssdk.crt.Log;
4742
import software.amazon.awssdk.regions.Region;
4843
import software.amazon.awssdk.services.s3.S3AsyncClient;
@@ -87,11 +82,6 @@ public void tearDown() {
8782
s3AsyncClient.close();
8883
}
8984

90-
@AfterAll
91-
public static void verifyCrtResource() {
92-
CrtResource.waitForNoResources();
93-
}
94-
9585
@Test
9686
void toBlockingInputStream_abortStream_shouldCloseResources() throws IOException {
9787
ResponseInputStream<GetObjectResponse> response = s3AsyncClient.getObject(

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtClientWiremockTest.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,19 @@
1818
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
1919
import static com.github.tomakehurst.wiremock.client.WireMock.any;
2020
import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
21-
import static com.github.tomakehurst.wiremock.client.WireMock.head;
2221
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
2322
import static org.assertj.core.api.Assertions.assertThat;
2423
import static org.mockito.ArgumentMatchers.any;
2524
import static org.mockito.Mockito.verify;
2625

27-
import com.github.tomakehurst.wiremock.client.WireMock;
2826
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
2927
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
3028
import java.net.URI;
3129
import java.util.concurrent.Executor;
32-
import org.junit.jupiter.api.AfterAll;
3330
import org.junit.jupiter.api.AfterEach;
3431
import org.junit.jupiter.api.BeforeAll;
3532
import org.junit.jupiter.api.BeforeEach;
3633
import org.junit.jupiter.api.Test;
37-
import org.mockito.ArgumentMatchers;
3834
import org.mockito.Mockito;
3935
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
4036
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
@@ -87,11 +83,6 @@ public void tearDown() {
8783
s3AsyncClient.close();
8884
}
8985

90-
@AfterAll
91-
public static void verifyCrtResource() {
92-
CrtResource.waitForNoResources();
93-
}
94-
9586
@Test
9687
public void completeMultipartUpload_completeResponse() {
9788
stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withBody(XML_RESPONSE_BODY)));

0 commit comments

Comments
 (0)