Skip to content

Commit 7bab15e

Browse files
committed
fix test
1 parent 45b5e6d commit 7bab15e

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamFailureStoreTemplateTests.java

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,14 @@ public void testTemplateComposition() {
8383
randomBoolean() ? null : DataStreamLifecycleTemplateTests.randomFailuresLifecycleTemplate()
8484
);
8585
DataStreamFailureStore.Template result = DataStreamFailureStore.builder(template).composeTemplate(template).buildTemplate();
86-
assertThat(result, equalTo(template));
86+
assertThat(result, equalTo(normalise(template)));
8787

8888
// Override only enabled and keep lifecycle undefined
8989
DataStreamFailureStore.Template negatedEnabledTemplate = DataStreamFailureStore.builder(template)
9090
.enabled(enabled == false)
9191
.buildTemplate();
9292
result = DataStreamFailureStore.builder(template).composeTemplate(negatedEnabledTemplate).buildTemplate();
93-
assertThat(result.enabled().get(), not(equalTo(enabled)));
94-
assertThat(result.lifecycle(), equalTo(template.lifecycle()));
93+
assertThat(result, equalTo(normalise(new DataStreamFailureStore.Template(enabled == false, template.lifecycle().get()))));
9594

9695
// Override only lifecycle and ensure it is merged
9796
enabled = false; // Ensure it's not the default to ensure that it will not be overwritten
@@ -137,4 +136,19 @@ public void testTemplateComposition() {
137136
private static <T> ResettableValue<T> randomEmptyResettableValue() {
138137
return randomBoolean() ? ResettableValue.undefined() : ResettableValue.reset();
139138
}
139+
140+
private static DataStreamFailureStore.Template normalise(DataStreamFailureStore.Template failureStoreTemplate) {
141+
return new DataStreamFailureStore.Template(
142+
failureStoreTemplate.enabled(),
143+
failureStoreTemplate.lifecycle()
144+
.map(
145+
template -> new DataStreamLifecycle.Template(
146+
template.lifecycleType(),
147+
template.enabled(),
148+
template.dataRetention().get(),
149+
template.downsampling().get()
150+
)
151+
)
152+
);
153+
}
140154
}

0 commit comments

Comments
 (0)