Skip to content

Fixing ComposableIndexTemplateTests #130052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 26, 2025
Merged

Fixing ComposableIndexTemplateTests #130052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4cf5ed
Fixing ComposableIndexTemplateTests
masseyke Jun 25, 2025
0d7e6d2
copilot feedback
masseyke Jun 26, 2025
304de27
merging main
masseyke Jun 26, 2025
6d96fe1
fixing bad merge
masseyke Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,12 @@ public void testMergeEmptyMappingsIntoTemplateWithNonEmptySettings() throws IOEx
// 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));
}

Expand Down