Skip to content

Commit d366690

Browse files
authored
[6.8] Mute CertificateToolTests.testCreateCaAndMultipleInstances and testTrustBetweenPEMandPKCS12 on Java 8 (#73587)
Partial backport of #72529 for 6.8 Relates #72359
1 parent ce6ae09 commit d366690

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/CertificateToolTests.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.bouncycastle.openssl.PEMEncryptedKeyPair;
2525
import org.bouncycastle.openssl.PEMParser;
2626
import org.bouncycastle.pkcs.PKCS10CertificationRequest;
27+
import org.elasticsearch.bootstrap.JavaVersion;
2728
import org.elasticsearch.cli.MockTerminal;
2829
import org.elasticsearch.cli.Terminal;
2930
import org.elasticsearch.cli.UserException;
@@ -526,6 +527,9 @@ public void testNameValues() throws Exception {
526527
* - Checks that all 3 certificates have the right values based on the command line options provided during generation
527528
*/
528529
public void testCreateCaAndMultipleInstances() throws Exception {
530+
assumeFalse("JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/72359",
531+
JavaVersion.current().compareTo(JavaVersion.parse("8")) == 0);
532+
529533
final Path tempDir = initTempDir();
530534

531535
final Terminal terminal = new MockTerminal();
@@ -656,6 +660,9 @@ Path resolveOutputPath(Terminal terminal, OptionSet options, String defaultFilen
656660
* - Checks that the PKCS12 certificate and the PEM certificate trust one another
657661
*/
658662
public void testTrustBetweenPEMandPKCS12() throws Exception {
663+
assumeFalse("JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/72359",
664+
JavaVersion.current().compareTo(JavaVersion.parse("8")) == 0);
665+
659666
final Path tempDir = initTempDir();
660667

661668
final MockTerminal terminal = new MockTerminal();

0 commit comments

Comments
 (0)