From 29d9cb2b5f9ca34c8cdcebffcec7ecc02f26dbe9 Mon Sep 17 00:00:00 2001 From: Ioannis Kakavas Date: Tue, 15 Feb 2022 15:17:16 +0200 Subject: [PATCH] Remove redundant mute for bug JDK-8266279 We had muted specific tests that were hit by JDK-8266279, by not allowing the tests to run on Java 1.8.0_292. We have since upgraded our Java 8 version in CI to Java 1.8.0_301 so the muting is irrelevant and can be removed Resolves #75571, #75417, #75379, #72639, #72359, #75952, #75718 --- .../security/cli/CertificateGenerateToolTests.java | 4 ---- .../xpack/security/cli/CertificateToolTests.java | 12 ------------ .../security/cli/HttpCertificateCommandTests.java | 8 -------- .../xpack/security/authc/saml/SamlRealmTests.java | 8 -------- 4 files changed, 32 deletions(-) diff --git a/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/CertificateGenerateToolTests.java b/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/CertificateGenerateToolTests.java index 0d5ab57fa442b..6cf241a131dfa 100644 --- a/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/CertificateGenerateToolTests.java +++ b/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/CertificateGenerateToolTests.java @@ -266,10 +266,6 @@ public void testGeneratingCsr() throws Exception { } public void testGeneratingSignedCertificates() throws Exception { - assumeFalse( - "JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/72639", - "1.8.0_292".equals(System.getProperty("java.version")) - ); Path tempDir = initTempDir(); Path outputFile = tempDir.resolve("out.zip"); 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 32ea6c102ae5a..d411bdad1416d 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 @@ -425,10 +425,6 @@ public void testGeneratingSignedPemCertificates() throws Exception { } public void testHandleLongPasswords() throws Exception { - assumeFalse( - "JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/75571", - "1.8.0_292".equals(System.getProperty("java.version")) - ); final Path tempDir = initTempDir(); @@ -655,10 +651,6 @@ 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/75571", - "1.8.0_292".equals(System.getProperty("java.version")) - ); final Path tempDir = initTempDir(); final MockTerminal terminal = new MockTerminal(); @@ -839,10 +831,6 @@ 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/75571", - "1.8.0_292".equals(System.getProperty("java.version")) - ); final Path tempDir = initTempDir(); final MockTerminal terminal = new MockTerminal(); diff --git a/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java b/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java index 81aa9a6da540c..27e21beae8b5f 100644 --- a/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java +++ b/x-pack/plugin/security/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java @@ -118,14 +118,6 @@ public static void muteInFips() { assumeFalse("Can't run in a FIPS JVM", inFipsJvm()); } - @BeforeClass - public static void muteOnBrokenJdk() { - assumeFalse( - "JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/72359", - "1.8.0_292".equals(System.getProperty("java.version")) - ); - } - public void testGenerateSingleCertificateSigningRequest() throws Exception { final Path outFile = testRoot.resolve("csr.zip").toAbsolutePath(); diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlRealmTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlRealmTests.java index 59a41ac84e9f5..b8ef6f7bf9af6 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlRealmTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlRealmTests.java @@ -118,14 +118,6 @@ public void setupEnv() throws PrivilegedActionException { threadContext = new ThreadContext(globalSettings); } - @BeforeClass - public static void muteOnBrokenJdk() { - assumeFalse( - "JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/75571", - "1.8.0_292".equals(System.getProperty("java.version")) - ); - } - public void testReadIdpMetadataFromFile() throws Exception { final Path path = getDataPath("idp1.xml"); Tuple config = buildConfig(path.toString());