From d36669052a28ed34b311e2f5ea45ed30fac17c04 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Tue, 1 Jun 2021 14:20:21 +0200 Subject: [PATCH] [6.8] Mute CertificateToolTests.testCreateCaAndMultipleInstances and testTrustBetweenPEMandPKCS12 on Java 8 (#73587) Partial backport of #72529 for 6.8 Relates #72359 --- .../xpack/security/cli/CertificateToolTests.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/CertificateToolTests.java b/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/CertificateToolTests.java index 9e970ea559ad7..1ca319709d5b1 100644 --- a/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/CertificateToolTests.java +++ b/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/CertificateToolTests.java @@ -24,6 +24,7 @@ import org.bouncycastle.openssl.PEMEncryptedKeyPair; import org.bouncycastle.openssl.PEMParser; import org.bouncycastle.pkcs.PKCS10CertificationRequest; +import org.elasticsearch.bootstrap.JavaVersion; import org.elasticsearch.cli.MockTerminal; import org.elasticsearch.cli.Terminal; import org.elasticsearch.cli.UserException; @@ -526,6 +527,9 @@ public void testNameValues() throws Exception { * - Checks that all 3 certificates have the right values based on the command line options provided during generation */ public void testCreateCaAndMultipleInstances() throws Exception { + assumeFalse("JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/72359", + JavaVersion.current().compareTo(JavaVersion.parse("8")) == 0); + final Path tempDir = initTempDir(); final Terminal terminal = new MockTerminal(); @@ -656,6 +660,9 @@ Path resolveOutputPath(Terminal terminal, OptionSet options, String defaultFilen * - Checks that the PKCS12 certificate and the PEM certificate trust one another */ public void testTrustBetweenPEMandPKCS12() throws Exception { + assumeFalse("JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/72359", + JavaVersion.current().compareTo(JavaVersion.parse("8")) == 0); + final Path tempDir = initTempDir(); final MockTerminal terminal = new MockTerminal();