github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fixing ComposableIndexTemplateTests (#130052)

Browse source
This commit is contained in:
Keith Massey 2025-06-26 09:41:07 -05:00 • committed by GitHub
parent 2a59bed068
commit 49506362cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
muted-tests.yml
View file

@ -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

7
server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java
View file

@ -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));
}