Skip to content

Commit 6545e3b

Browse files
Mute flaky security tests (#73537)
1 parent 14f3273 commit 6545e3b

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

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

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.apache.lucene.store.IOContext;
1010
import org.apache.lucene.store.IndexOutput;
1111
import org.apache.lucene.store.SimpleFSDirectory;
12+
import org.elasticsearch.bootstrap.JavaVersion;
1213
import org.elasticsearch.common.settings.KeyStoreWrapper;
1314
import org.elasticsearch.common.settings.Settings;
1415
import org.elasticsearch.env.Environment;
@@ -27,6 +28,8 @@
2728
public class FIPS140SecureSettingsBootstrapCheckTests extends AbstractBootstrapCheckTestCase {
2829

2930
public void testLegacySecureSettingsIsNotAllowed() throws Exception {
31+
assumeFalse("JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/68995",
32+
JavaVersion.current().compareTo(JavaVersion.parse("8")) == 0);
3033
assumeFalse("Can't run in a FIPS JVM, PBE is not available", inFipsJvm());
3134
final Settings.Builder builder = Settings.builder()
3235
.put("path.home", createTempDir())

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/saml/SamlMetadataCommandTests.java

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import joptsimple.OptionSet;
99

1010
import org.elasticsearch.ExceptionsHelper;
11+
import org.elasticsearch.bootstrap.JavaVersion;
1112
import org.elasticsearch.cli.MockTerminal;
1213
import org.elasticsearch.cli.UserException;
1314
import org.elasticsearch.common.collect.Tuple;
@@ -550,6 +551,8 @@ public void testSigningMetadataWithPasswordProtectedPemInTerminal() throws Excep
550551
}
551552

552553
public void testDefaultOptionsWithSigningAndMultipleEncryptionKeys() throws Exception {
554+
assumeFalse("JDK bug JDK-8266279, https://github.com/elastic/elasticsearch/issues/68995",
555+
JavaVersion.current().compareTo(JavaVersion.parse("8")) == 0);
553556
final Path dir = createTempDir();
554557

555558
final Path ksEncryptionFile = dir.resolve("saml-encryption.p12");

0 commit comments

Comments
 (0)