Skip to content

Commit b35e97e

Browse files
authored
Fix various test to run with FIPS and entitlements (#130616)
1 parent 7b1b2c7 commit b35e97e

File tree

2 files changed

+2
-27
lines changed

2 files changed

+2
-27
lines changed

muted-tests.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -563,36 +563,9 @@ tests:
563563
- class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
564564
method: testTopNPushedToLucene
565565
issue: https://github.com/elastic/elasticsearch/issues/130505
566-
- class: org.elasticsearch.common.ssl.DefaultJdkTrustConfigTests
567-
method: testGetSystemTrustStoreWithNoSystemProperties
568-
issue: https://github.com/elastic/elasticsearch/issues/130517
569-
- class: org.elasticsearch.common.ssl.DefaultJdkTrustConfigTests
570-
method: testGetNonPKCS11TrustStoreWithPasswordSet
571-
issue: https://github.com/elastic/elasticsearch/issues/130519
572566
- class: org.elasticsearch.multiproject.test.CoreWithMultipleProjectsClientYamlTestSuiteIT
573567
method: test {yaml=indices.resolve_index/10_basic_resolve_index/Resolve index with hidden and closed indices}
574568
issue: https://github.com/elastic/elasticsearch/issues/130568
575-
- class: org.elasticsearch.reindex.ReindexRestClientSslTests
576-
method: testClientPassesClientCertificate
577-
issue: https://github.com/elastic/elasticsearch/issues/130584
578-
- class: org.elasticsearch.reindex.ReindexRestClientSslTests
579-
method: testClientFailsWithUntrustedCertificate
580-
issue: https://github.com/elastic/elasticsearch/issues/130585
581-
- class: org.elasticsearch.reindex.ReindexRestClientSslTests
582-
method: testClientSucceedsWithCertificateAuthorities
583-
issue: https://github.com/elastic/elasticsearch/issues/130586
584-
- class: org.elasticsearch.reindex.ReindexFromRemoteBuildRestClientTests
585-
method: testHeaders
586-
issue: https://github.com/elastic/elasticsearch/issues/130587
587-
- class: org.elasticsearch.reindex.ReindexFromRemoteBuildRestClientTests
588-
method: testBuildRestClient
589-
issue: https://github.com/elastic/elasticsearch/issues/130588
590-
- class: org.elasticsearch.http.netty4.Netty4HttpServerTransportTests
591-
method: testRespondAfterServiceCloseWithClientCancel
592-
issue: https://github.com/elastic/elasticsearch/issues/130590
593-
- class: org.elasticsearch.http.netty4.Netty4HttpServerTransportTests
594-
method: testRespondAfterServiceCloseWithServerCancel
595-
issue: https://github.com/elastic/elasticsearch/issues/130591
596569
- class: org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT
597570
method: test
598571
issue: https://github.com/elastic/elasticsearch/issues/130067

test/framework/src/main/java/org/elasticsearch/entitlement/runtime/policy/TestPolicyManager.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ private boolean isTestCode(Class<?> requestingClass) {
159159
"org.junit",
160160
"org.mockito",
161161
"net.bytebuddy", // Mockito uses this
162+
163+
"org.bouncycastle.jsse.provider" // Used in test code if FIPS is enabled, support more fine-grained config in ES-12128
162164
};
163165

164166
@Override

0 commit comments

Comments
 (0)