Skip to content

Commit dc011de

Browse files
committed
Revert "Create BouncyCastleThreadFilter"
This reverts commit 2c9d269. Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent 2c9d269 commit dc011de

File tree

8 files changed

+0
-64
lines changed

8 files changed

+0
-64
lines changed

libs/ssl-config/src/test/java/org/opensearch/common/ssl/BouncyCastleThreadFilter.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemKeyConfigTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232

3333
package org.opensearch.common.ssl;
3434

35-
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
36-
3735
import org.opensearch.test.OpenSearchTestCase;
3836
import org.hamcrest.Matchers;
3937

@@ -57,7 +55,6 @@
5755
import static org.hamcrest.Matchers.iterableWithSize;
5856
import static org.hamcrest.Matchers.notNullValue;
5957

60-
@ThreadLeakFilters(filters = BouncyCastleThreadFilter.class)
6158
public class PemKeyConfigTests extends OpenSearchTestCase {
6259
private static final int IP_NAME = 7;
6360
private static final int DNS_NAME = 2;

libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemTrustConfigTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232

3333
package org.opensearch.common.ssl;
3434

35-
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
36-
3735
import org.opensearch.test.OpenSearchTestCase;
3836
import org.hamcrest.Matchers;
3937

@@ -53,7 +51,6 @@
5351
import java.util.stream.Collectors;
5452
import java.util.stream.Stream;
5553

56-
@ThreadLeakFilters(filters = BouncyCastleThreadFilter.class)
5754
public class PemTrustConfigTests extends OpenSearchTestCase {
5855

5956
public void testBuildTrustConfigFromSinglePemFile() throws Exception {

libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemUtilsTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232

3333
package org.opensearch.common.ssl;
3434

35-
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
36-
3735
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
3836
import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
3937
import org.opensearch.test.OpenSearchTestCase;
@@ -58,7 +56,6 @@
5856
import static org.hamcrest.Matchers.equalTo;
5957
import static org.hamcrest.core.StringContains.containsString;
6058

61-
@ThreadLeakFilters(filters = BouncyCastleThreadFilter.class)
6259
public class PemUtilsTests extends OpenSearchTestCase {
6360

6461
private static final Supplier<char[]> EMPTY_PASSWORD = () -> new char[0];

libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationLoaderTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232

3333
package org.opensearch.common.ssl;
3434

35-
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
36-
3735
import org.opensearch.common.settings.MockSecureSettings;
3836
import org.opensearch.common.settings.Settings;
3937
import org.opensearch.core.common.settings.SecureString;
@@ -53,7 +51,6 @@
5351
import static org.hamcrest.Matchers.is;
5452
import static org.hamcrest.Matchers.notNullValue;
5553

56-
@ThreadLeakFilters(filters = BouncyCastleThreadFilter.class)
5754
public class SslConfigurationLoaderTests extends OpenSearchTestCase {
5855

5956
private final String STRONG_PRIVATE_SECRET = "6!6428DQXwPpi7@$ggeg/=";

libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232

3333
package org.opensearch.common.ssl;
3434

35-
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
36-
3735
import org.opensearch.common.Nullable;
3836
import org.opensearch.test.OpenSearchTestCase;
3937
import org.hamcrest.Matchers;
@@ -61,7 +59,6 @@
6159

6260
import org.mockito.Mockito;
6361

64-
@ThreadLeakFilters(filters = BouncyCastleThreadFilter.class)
6562
public class SslDiagnosticsTests extends OpenSearchTestCase {
6663

6764
// Some constants for use in mock certificates

modules/reindex/src/test/java/org/opensearch/index/reindex/BouncyCastleThreadFilter.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232

3333
package org.opensearch.index.reindex;
3434

35-
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
36-
3735
import com.sun.net.httpserver.HttpsConfigurator;
3836
import com.sun.net.httpserver.HttpsExchange;
3937
import com.sun.net.httpserver.HttpsParameters;
@@ -84,7 +82,6 @@
8482
* right SSL keys + trust settings.
8583
*/
8684
@SuppressForbidden(reason = "use http server")
87-
@ThreadLeakFilters(filters = BouncyCastleThreadFilter.class)
8885
public class ReindexRestClientSslTests extends OpenSearchTestCase {
8986

9087
private static final String STRONG_PRIVATE_SECRET = "6!6428DQXwPpi7@$ggeg/=";

0 commit comments

Comments
 (0)