From ae5c70e6037ed2b7f27b231177990cd590690d30 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Thu, 12 Jul 2018 11:51:33 +0200 Subject: [PATCH] muted tests due to #31940 --- .../org/elasticsearch/client/RestClientBuilderIntegTests.java | 3 +++ .../smoketest/SmokeTestMonitoringWithSecurityIT.java | 1 + 2 files changed, 4 insertions(+) diff --git a/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderIntegTests.java b/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderIntegTests.java index 93f8481bea6..30359ea90f6 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderIntegTests.java +++ b/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderIntegTests.java @@ -72,6 +72,9 @@ public class RestClientBuilderIntegTests extends RestClientTestCase { } public void testBuilderUsesDefaultSSLContext() throws Exception { + assumeFalse("Due to bug inside jdk, this test can't momentarily run with java 11. " + + "See: https://github.com/elastic/elasticsearch/issues/31940", + System.getProperty("java.version").contains("11")); final SSLContext defaultSSLContext = SSLContext.getDefault(); try { try (RestClient client = buildRestClient()) { diff --git a/x-pack/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityIT.java b/x-pack/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityIT.java index c427d8bf32c..52c2a7dfa2d 100644 --- a/x-pack/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityIT.java +++ b/x-pack/qa/smoke-test-plugins-ssl/src/test/java/org/elasticsearch/smoketest/SmokeTestMonitoringWithSecurityIT.java @@ -127,6 +127,7 @@ public class SmokeTestMonitoringWithSecurityIT extends ESIntegTestCase { return monitoringUsage.get().getExporters().isEmpty() == false; } + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/31940") public void testHTTPExporterWithSSL() throws Exception { // Ensures that the exporter is actually on assertBusy(() -> assertThat("[_http] exporter is not defined", getMonitoringUsageExportersDefined(), is(true)));