honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-26 23:07:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix throttling test failure

Browse Source 
Original commit: elastic/x-pack-elasticsearch@f3799bddeb
This commit is contained in:
uboness 2015-06-06 04:03:51 +02:00
parent 034425185a
commit 096bd5b039
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/test/java/org/elasticsearch/watcher/actions/throttler/ActionThrottleTests.java
View File

@ -10,7 +10,6 @@ import org.apache.lucene.util.LuceneTestCase.Slow;
import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.common.joda.time.DateTime; import org.elasticsearch.common.joda.time.DateTime;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.support.XContentMapValues;
import org.elasticsearch.watcher.actions.Action; import org.elasticsearch.watcher.actions.Action;
import org.elasticsearch.watcher.actions.ActionWrapper; import org.elasticsearch.watcher.actions.ActionWrapper;
import org.elasticsearch.watcher.actions.email.EmailAction; import org.elasticsearch.watcher.actions.email.EmailAction;
@ -22,11 +21,11 @@ import org.elasticsearch.watcher.client.WatchSourceBuilder;
import org.elasticsearch.watcher.execution.ActionExecutionMode; import org.elasticsearch.watcher.execution.ActionExecutionMode;
import org.elasticsearch.watcher.execution.ExecutionState; import org.elasticsearch.watcher.execution.ExecutionState;
import org.elasticsearch.watcher.execution.ManualExecutionContext; import org.elasticsearch.watcher.execution.ManualExecutionContext;
import org.elasticsearch.watcher.execution.WatchExecutionResult;
import org.elasticsearch.watcher.history.WatchRecord; import org.elasticsearch.watcher.history.WatchRecord;
import org.elasticsearch.watcher.support.clock.SystemClock; import org.elasticsearch.watcher.support.clock.SystemClock;
import org.elasticsearch.watcher.support.http.HttpRequestTemplate; import org.elasticsearch.watcher.support.http.HttpRequestTemplate;
import org.elasticsearch.watcher.support.template.Template; import org.elasticsearch.watcher.support.template.Template;
import org.elasticsearch.watcher.support.xcontent.MapPath;
import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTests; import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTests;
import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse; import org.elasticsearch.watcher.transport.actions.execute.ExecuteWatchResponse;
import org.elasticsearch.watcher.transport.actions.get.GetWatchRequest; import org.elasticsearch.watcher.transport.actions.get.GetWatchRequest;
@ -40,7 +39,6 @@ import org.junit.Test;
import java.io.IOException; import java.io.IOException;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -49,7 +47,8 @@ import static org.elasticsearch.common.joda.time.DateTimeZone.UTC;
import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder; import static org.elasticsearch.watcher.client.WatchSourceBuilders.watchBuilder;
import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule; import static org.elasticsearch.watcher.trigger.TriggerBuilders.schedule;
import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval; import static org.elasticsearch.watcher.trigger.schedule.Schedules.interval;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
/** /**
*/ */
@ -225,7 +224,7 @@ public class ActionThrottleTests extends AbstractWatcherIntegrationTests {
.setRecordExecution(true) .setRecordExecution(true)
.get(); .get();
Map<String, Object> watchRecordMap = executeWatchResponse.getRecordSource().getAsMap(); Map<String, Object> watchRecordMap = executeWatchResponse.getRecordSource().getAsMap();
Object resultStatus = getExecutionStatus(actionType, watchRecordMap); Object resultStatus = getExecutionStatus(watchRecordMap);
assertThat(resultStatus.toString(), equalTo("simulated")); assertThat(resultStatus.toString(), equalTo("simulated"));
if (timeWarped()) { if (timeWarped()) {
@ -238,7 +237,7 @@ public class ActionThrottleTests extends AbstractWatcherIntegrationTests {
.setRecordExecution(true) .setRecordExecution(true)
.get(); .get();
watchRecordMap = executeWatchResponse.getRecordSource().getAsMap(); watchRecordMap = executeWatchResponse.getRecordSource().getAsMap();
resultStatus = getExecutionStatus(actionType, watchRecordMap); resultStatus = getExecutionStatus(watchRecordMap);
assertThat(resultStatus.toString(), equalTo("throttled")); assertThat(resultStatus.toString(), equalTo("throttled"));
if (timeWarped()) { if (timeWarped()) {
@ -255,7 +254,7 @@ public class ActionThrottleTests extends AbstractWatcherIntegrationTests {
.setRecordExecution(true) .setRecordExecution(true)
.get(); .get();
Map<String, Object> watchRecordMap = executeWatchResponse.getRecordSource().getAsMap(); Map<String, Object> watchRecordMap = executeWatchResponse.getRecordSource().getAsMap();
Object resultStatus = getExecutionStatus(actionType, watchRecordMap); Object resultStatus = getExecutionStatus(watchRecordMap);
assertThat(resultStatus.toString(), equalTo("simulated")); assertThat(resultStatus.toString(), equalTo("simulated"));
} catch (IOException ioe) { } catch (IOException ioe) {
throw new ElasticsearchException("failed to execute", ioe); throw new ElasticsearchException("failed to execute", ioe);
@ -288,7 +287,7 @@ public class ActionThrottleTests extends AbstractWatcherIntegrationTests {
.setRecordExecution(true) .setRecordExecution(true)
.get(); .get();
Map<String, Object> watchRecordMap = executeWatchResponse.getRecordSource().getAsMap(); Map<String, Object> watchRecordMap = executeWatchResponse.getRecordSource().getAsMap();
Object resultStatus = getExecutionStatus(actionType, watchRecordMap); Object resultStatus = getExecutionStatus(watchRecordMap);
assertThat(resultStatus.toString(), equalTo("simulated")); assertThat(resultStatus.toString(), equalTo("simulated"));
if (timeWarped()) { if (timeWarped()) {
@ -301,7 +300,7 @@ public class ActionThrottleTests extends AbstractWatcherIntegrationTests {
.setRecordExecution(true) .setRecordExecution(true)
.get(); .get();
watchRecordMap = executeWatchResponse.getRecordSource().getAsMap(); watchRecordMap = executeWatchResponse.getRecordSource().getAsMap();
resultStatus = getExecutionStatus(actionType, watchRecordMap); resultStatus = getExecutionStatus(watchRecordMap);
assertThat(resultStatus.toString(), equalTo("throttled")); assertThat(resultStatus.toString(), equalTo("throttled"));
if (timeWarped()) { if (timeWarped()) {
@ -318,7 +317,7 @@ public class ActionThrottleTests extends AbstractWatcherIntegrationTests {
.setRecordExecution(true) .setRecordExecution(true)
.get(); .get();
Map<String, Object> watchRecordMap = executeWatchResponse.getRecordSource().getAsMap(); Map<String, Object> watchRecordMap = executeWatchResponse.getRecordSource().getAsMap();
Object resultStatus = getExecutionStatus(actionType, watchRecordMap); Object resultStatus = getExecutionStatus(watchRecordMap);
assertThat(resultStatus.toString(), equalTo("simulated")); assertThat(resultStatus.toString(), equalTo("simulated"));
} catch (IOException ioe) { } catch (IOException ioe) {
throw new ElasticsearchException("failed to execute", ioe); throw new ElasticsearchException("failed to execute", ioe);
@ -363,15 +362,8 @@ public class ActionThrottleTests extends AbstractWatcherIntegrationTests {
} }
private String getExecutionStatus(String actionType, Map<String, Object> watchRecordMap) { private String getExecutionStatus(Map<String, Object> watchRecordMap) {
Object actionResults = XContentMapValues.extractValue(WatchRecord.Field.EXECUTION_RESULT.getPreferredName() + "." return MapPath.eval("result.actions.0.status", watchRecordMap);
+ WatchExecutionResult.Field.ACTIONS.getPreferredName(), watchRecordMap);
assertThat(actionResults, instanceOf(List.class));
List actionResultsList = (List) actionResults;
assertThat(actionResultsList.get(0), instanceOf(Map.class));
return XContentMapValues.extractValue(actionType + ".status", (Map<String,Object>) actionResultsList.get(0)).toString();
} }
private ManualExecutionContext getManualExecutionContext(TimeValue throttlePeriod) { private ManualExecutionContext getManualExecutionContext(TimeValue throttlePeriod) {