Skip to content

Reinstate watch count check in tests with busy/wait #123979

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 1 commit into from
Mar 6, 2025
Merged

Reinstate watch count check in tests with busy/wait #123979

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions ...ernalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/WatchAckTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.elasticsearch.xpack.core.watcher.transport.actions.get.GetWatchRequestBuilder;
import org.elasticsearch.xpack.core.watcher.transport.actions.get.GetWatchResponse;
import org.elasticsearch.xpack.core.watcher.transport.actions.put.PutWatchRequestBuilder;
import org.elasticsearch.xpack.core.watcher.transport.actions.stats.WatcherStatsRequestBuilder;
import org.elasticsearch.xpack.core.watcher.watch.Watch;
import org.elasticsearch.xpack.watcher.condition.CompareCondition;
import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase;
Expand Down Expand Up @@ -75,6 +76,8 @@ public void testAckSingleAction() throws Exception {

assertThat(putWatchResponse.isCreated(), is(true));

assertBusy(() -> assertThat(new WatcherStatsRequestBuilder(client()).get().getWatchesCount(), is(1L)));

timeWarp().trigger("_id", 4, TimeValue.timeValueSeconds(5));
AckWatchResponse ackResponse = new AckWatchRequestBuilder(client(), "_id").setActionIds("_a1").get();
assertThat(ackResponse.getStatus().actionStatus("_a1").ackStatus().state(), is(ActionStatus.AckStatus.State.ACKED));
Expand Down Expand Up @@ -146,6 +149,7 @@ public void testAckAllActions() throws Exception {
.get();

assertThat(putWatchResponse.isCreated(), is(true));
assertBusy(() -> assertThat(new WatcherStatsRequestBuilder(client()).get().getWatchesCount(), is(1L)));

timeWarp().trigger("_id", 4, TimeValue.timeValueSeconds(5));

Expand Down Expand Up @@ -223,6 +227,7 @@ public void testAckWithRestart() throws Exception {
)
.get();
assertThat(putWatchResponse.isCreated(), is(true));
assertBusy(() -> assertThat(new WatcherStatsRequestBuilder(client()).get().getWatchesCount(), is(1L)));

timeWarp().trigger("_name", 4, TimeValue.timeValueSeconds(5));
restartWatcherRandomly();
Expand Down