Fix testRolloverForFreshInstalledIndexTemplate (#116450) (#116454)

axw · web-flow · commit 12ff76a92922 · 2024-11-08T15:43:33.000+11:00
Fix IndexTemplateRegistryTests.testRolloverForFreshInstalledIndexTemplate
by using assertBusy, now that we're expecting a rollover.
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistryTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistryTests.java
@@ -475,8 +475,7 @@ public void testRolloverForFreshInstalledIndexTemplate() throws Exception {
         assertBusy(() -> assertThat(putIndexTemplateCounter.get(), equalTo(1)));
         // rollover should be triggered even for the first installation, since the template
         // may now take precedence over a data stream's existing index template
-        Thread.sleep(100L);
-        assertThat(rolloverCounter.get(), equalTo(2));
+        assertBusy(() -> assertThat(rolloverCounter.get(), equalTo(2)));
     }
 
     public void testThatTemplatesAreNotUpgradedWhenNotNeeded() throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -475,8 +475,7 @@ public void testRolloverForFreshInstalledIndexTemplate() throws Exception {`
`475`	`475`	`assertBusy(() -> assertThat(putIndexTemplateCounter.get(), equalTo(1)));`
`476`	`476`	`// rollover should be triggered even for the first installation, since the template`
`477`	`477`	`// may now take precedence over a data stream's existing index template`
`478`		`- Thread.sleep(100L);`
`479`		`- assertThat(rolloverCounter.get(), equalTo(2));`
	`478`	`+ assertBusy(() -> assertThat(rolloverCounter.get(), equalTo(2)));`
`480`	`479`	`}`
`481`	`480`
`482`	`481`	`public void testThatTemplatesAreNotUpgradedWhenNotNeeded() throws Exception {`