Mute flaky security tests (#73537)

elastic · May 28, 2021 · 6545e3b · 6545e3b
1 parent 14f3273
commit 6545e3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.../test/java/org/elasticsearch/xpack/security/FIPS140SecureSettingsBootstrapCheckTests.java b/.../test/java/org/elasticsearch/xpack/security/FIPS140SecureSettingsBootstrapCheckTests.java
@@ -9,6 +9,7 @@
 import org.apache.lucene.store.IOContext;
 import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.store.SimpleFSDirectory;
+import org.elasticsearch.bootstrap.JavaVersion;
 import org.elasticsearch.common.settings.KeyStoreWrapper;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
@@ -27,6 +28,8 @@
 public class FIPS140SecureSettingsBootstrapCheckTests extends AbstractBootstrapCheckTestCase {
 
     public void testLegacySecureSettingsIsNotAllowed() throws Exception {
+        assumeFalse("JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/68995",
+            JavaVersion.current().compareTo(JavaVersion.parse("8")) == 0);
         assumeFalse("Can't run in a FIPS JVM, PBE is not available", inFipsJvm());
         final Settings.Builder builder = Settings.builder()
             .put("path.home", createTempDir())

diff --git a/...y/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlMetadataCommandTests.java b/...y/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlMetadataCommandTests.java
@@ -8,6 +8,7 @@
 import joptsimple.OptionSet;
 
 import org.elasticsearch.ExceptionsHelper;
+import org.elasticsearch.bootstrap.JavaVersion;
 import org.elasticsearch.cli.MockTerminal;
 import org.elasticsearch.cli.UserException;
 import org.elasticsearch.common.collect.Tuple;
@@ -550,6 +551,8 @@ public void testSigningMetadataWithPasswordProtectedPemInTerminal() throws Excep
     }
 
     public void testDefaultOptionsWithSigningAndMultipleEncryptionKeys() throws Exception {
+        assumeFalse("JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/68995",
+            JavaVersion.current().compareTo(JavaVersion.parse("8")) == 0);
         final Path dir = createTempDir();
 
         final Path ksEncryptionFile = dir.resolve("saml-encryption.p12");