Skip to content

Commit

Permalink
[6.8] Mute CertificateToolTests.testCreateCaAndMultipleInstances and …
Browse files Browse the repository at this point in the history
…testTrustBetweenPEMandPKCS12 on Java 8 (#73587)

Partial backport of #72529 for 6.8

Relates #72359
  • Loading branch information
tlrx authored Jun 1, 2021
1 parent ce6ae09 commit d366690
Showing 1 changed file with 7 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit d366690

Please sign in to comment.