honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-28 10:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test: fix timing issues in testConditionSearchWithSource() and testConditionSearchWithIndexedTemplate() tests.

Browse Source 
Original commit: elastic/x-pack-elasticsearch@79e5859dcf
This commit is contained in:
Martijn van Groningen 2015-04-07 20:04:28 +02:00
parent 4c6d2e7b39
commit 0f43a5933f
2 changed files with 15 additions and 6 deletions
src/test/java/org/elasticsearch/watcher
test/integration
BasicWatcherTests.java
trigger
ScheduleTriggerEngineMock.java

13
src/test/java/org/elasticsearch/watcher/test/integration/BasicWatcherTests.java

@ -8,6 +8,7 @@ package org.elasticsearch.watcher.test.integration;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.common.joda.time.DateTime;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.script.ScriptService;
@ -104,6 +105,7 @@ public class BasicWatcherTests extends AbstractWatcherIntegrationTests {
refresh();
if (timeWarped()) {
timeWarp().clock().fastForwardSeconds(5);
timeWarp().scheduler().trigger("_name");
refresh();
}
@ -194,6 +196,7 @@ public class BasicWatcherTests extends AbstractWatcherIntegrationTests {
.get();
if (timeWarped()) {
timeWarp().clock().fastForwardSeconds(5);
timeWarp().scheduler().trigger("_name");
refresh();
}
@ -204,6 +207,7 @@ public class BasicWatcherTests extends AbstractWatcherIntegrationTests {
.get();
if (timeWarped()) {
timeWarp().clock().fastForwardSeconds(5);
timeWarp().scheduler().trigger("_name");
refresh();
}
@ -216,6 +220,7 @@ public class BasicWatcherTests extends AbstractWatcherIntegrationTests {
.get();
if (timeWarped()) {
timeWarp().clock().fastForwardSeconds(5);
timeWarp().scheduler().trigger("_name");
refresh();
} else {
@ -225,6 +230,7 @@ public class BasicWatcherTests extends AbstractWatcherIntegrationTests {
long count = findNumberOfPerformedActions("_name");
if (timeWarped()) {
timeWarp().clock().fastForwardSeconds(5);
timeWarp().scheduler().trigger("_name");
refresh();
} else {
@ -313,10 +319,13 @@ public class BasicWatcherTests extends AbstractWatcherIntegrationTests {
}
private void testConditionSearch(SearchRequest request) throws Exception {
if (timeWarped()) {
// reset, so we don't miss event docs when we filter over the _timestamp field.
timeWarp().clock().setTime(new DateTime());
}
String watchName = "_name";
assertAcked(prepareCreate("events").addMapping("event", "_timestamp", "enabled=true", "level", "type=string"));
watcherClient().prepareDeleteWatch(watchName).get();
watcherClient().preparePutWatch(watchName)
.source(createWatchSource(interval("5s"), request, "return ctx.payload.hits.total >= 3"))
.get();

8
src/test/java/org/elasticsearch/watcher/trigger/ScheduleTriggerEngineMock.java

@ -87,10 +87,10 @@ public class ScheduleTriggerEngineMock extends ScheduleTriggerEngine {
for (Listener listener : listeners) {
listener.triggered(jobName, event);
}
if (clock instanceof ClockMock) {
((ClockMock) clock).fastForward(interval == null ? TimeValue.timeValueMillis(10) : interval);
} else {
if (interval != null) {
if (interval != null) {
if (clock instanceof ClockMock) {
((ClockMock) clock).fastForward(interval);
} else {
try {
Thread.sleep(interval.millis());
} catch (InterruptedException ie) {