From 49506362cf3d35dfb28c6f08a7fd2605f11b299d Mon Sep 17 00:00:00 2001 From: Keith Massey Date: Thu, 26 Jun 2025 09:41:07 -0500 Subject: [PATCH] Fixing ComposableIndexTemplateTests (#130052) --- muted-tests.yml | 3 --- .../cluster/metadata/ComposableIndexTemplateTests.java | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 70180a01cf1b..127b1c5f2f7a 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -563,9 +563,6 @@ tests: issue: https://github.com/elastic/elasticsearch/issues/130010 - class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT issue: https://github.com/elastic/elasticsearch/issues/128224 -- class: org.elasticsearch.cluster.metadata.ComposableIndexTemplateTests - method: testMergeEmptyMappingsIntoTemplateWithNonEmptySettings - issue: https://github.com/elastic/elasticsearch/issues/130050 - class: org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT method: test issue: https://github.com/elastic/elasticsearch/issues/130067 diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java index 7988e01b5517..6f3c30292029 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java @@ -352,7 +352,12 @@ public class ComposableIndexTemplateTests extends SimpleDiffableSerializationTes // Attempting to merge in null mappings ought to fail ComposableIndexTemplate indexTemplate = randomInstance(); expectThrows(NullPointerException.class, () -> indexTemplate.mergeMappings(null)); - assertThat(indexTemplate.mergeMappings(EMPTY_MAPPINGS), equalTo(indexTemplate)); + ComposableIndexTemplate mergedTemplate = indexTemplate.mergeMappings(EMPTY_MAPPINGS); + if (indexTemplate.template() == null || indexTemplate.template().mappings() == null) { + assertThat(mergedTemplate.template().mappings(), equalTo(EMPTY_MAPPINGS)); + } else { + assertThat(mergedTemplate, equalTo(indexTemplate)); + } assertThat(indexTemplate.mergeSettings(Settings.EMPTY), equalTo(indexTemplate)); }