From da43174c8227587d11c146bc0bd8437dc06f607d Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Mon, 3 Jun 2024 18:02:14 -0500 Subject: [PATCH] Fix test by removing unecessary mTLS --- muted-tests.yml | 3 --- x-pack/plugin/core/build.gradle | 3 ++- .../xpack/core/ssl/SSLConfigurationReloaderTests.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index fd1999d201bf0..ee7413303de85 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -5,9 +5,6 @@ tests: - class: "org.elasticsearch.cluster.coordination.CoordinatorVotingConfigurationTests" issue: "https://github.com/elastic/elasticsearch/issues/108729" method: "testClusterUUIDLogging" -- class: "org.elasticsearch.xpack.core.ssl.SSLConfigurationReloaderTests" - issue: "https://github.com/elastic/elasticsearch/issues/108774" - method: "testReloadingKeyStore" - class: "org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT" issue: "https://github.com/elastic/elasticsearch/issues/108808" method: "test {k8s-metrics.MetricsWithAggs}" diff --git a/x-pack/plugin/core/build.gradle b/x-pack/plugin/core/build.gradle index f0a00b7aa7e75..116f864695e15 100644 --- a/x-pack/plugin/core/build.gradle +++ b/x-pack/plugin/core/build.gradle @@ -191,5 +191,6 @@ tasks.register('testAutomatonPatterns', Test) { tasks.named('test').configure { exclude '**/AutomatonPatternsTests.class' - dependsOn testAutomatonPatterns //to ensure testAutomatonPatterns are run with the test task } + +tasks.named("check").configure { dependsOn "testAutomatonPatterns" } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ssl/SSLConfigurationReloaderTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ssl/SSLConfigurationReloaderTests.java index 02f9a58d7947d..7b19d53663a08 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ssl/SSLConfigurationReloaderTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ssl/SSLConfigurationReloaderTests.java @@ -130,7 +130,7 @@ public void testReloadingKeyStore() throws Exception { // Load HTTPClient only once. Client uses the same store as a truststore try (CloseableHttpClient client = getSSLClient(keystorePath, "testnode")) { final Consumer keyMaterialPreChecks = (context) -> { - try (MockWebServer server = new MockWebServer(context, true)) { + try (MockWebServer server = new MockWebServer(context, false)) { server.enqueue(new MockResponse().setResponseCode(200).setBody("body")); server.start(); privilegedConnect(() -> client.execute(new HttpGet("https://localhost:" + server.getPort())).close());