test: don't remove the watcher templates in between tests
Original commit: elastic/x-pack-elasticsearch@652c8d16ec
This commit is contained in:
parent
04178cbc30
commit
08698fda29
|
@ -34,10 +34,7 @@ import org.elasticsearch.shield.crypto.InternalCryptoService;
|
||||||
import org.elasticsearch.test.ESIntegTestCase;
|
import org.elasticsearch.test.ESIntegTestCase;
|
||||||
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
|
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
|
||||||
import org.elasticsearch.test.TestCluster;
|
import org.elasticsearch.test.TestCluster;
|
||||||
import org.elasticsearch.watcher.WatcherLifeCycleService;
|
import org.elasticsearch.watcher.*;
|
||||||
import org.elasticsearch.watcher.WatcherPlugin;
|
|
||||||
import org.elasticsearch.watcher.WatcherService;
|
|
||||||
import org.elasticsearch.watcher.WatcherState;
|
|
||||||
import org.elasticsearch.watcher.actions.email.service.Authentication;
|
import org.elasticsearch.watcher.actions.email.service.Authentication;
|
||||||
import org.elasticsearch.watcher.actions.email.service.Email;
|
import org.elasticsearch.watcher.actions.email.service.Email;
|
||||||
import org.elasticsearch.watcher.actions.email.service.EmailService;
|
import org.elasticsearch.watcher.actions.email.service.EmailService;
|
||||||
|
@ -45,8 +42,10 @@ import org.elasticsearch.watcher.actions.email.service.Profile;
|
||||||
import org.elasticsearch.watcher.client.WatcherClient;
|
import org.elasticsearch.watcher.client.WatcherClient;
|
||||||
import org.elasticsearch.watcher.execution.ExecutionService;
|
import org.elasticsearch.watcher.execution.ExecutionService;
|
||||||
import org.elasticsearch.watcher.execution.ExecutionState;
|
import org.elasticsearch.watcher.execution.ExecutionState;
|
||||||
|
import org.elasticsearch.watcher.execution.TriggeredWatchStore;
|
||||||
import org.elasticsearch.watcher.history.HistoryStore;
|
import org.elasticsearch.watcher.history.HistoryStore;
|
||||||
import org.elasticsearch.watcher.license.LicenseService;
|
import org.elasticsearch.watcher.license.LicenseService;
|
||||||
|
import org.elasticsearch.watcher.support.WatcherIndexTemplateRegistry;
|
||||||
import org.elasticsearch.watcher.support.clock.ClockMock;
|
import org.elasticsearch.watcher.support.clock.ClockMock;
|
||||||
import org.elasticsearch.watcher.support.http.HttpClient;
|
import org.elasticsearch.watcher.support.http.HttpClient;
|
||||||
import org.elasticsearch.watcher.support.init.proxy.ScriptServiceProxy;
|
import org.elasticsearch.watcher.support.init.proxy.ScriptServiceProxy;
|
||||||
|
@ -55,6 +54,7 @@ import org.elasticsearch.watcher.trigger.ScheduleTriggerEngineMock;
|
||||||
import org.elasticsearch.watcher.trigger.TriggerService;
|
import org.elasticsearch.watcher.trigger.TriggerService;
|
||||||
import org.elasticsearch.watcher.trigger.schedule.ScheduleModule;
|
import org.elasticsearch.watcher.trigger.schedule.ScheduleModule;
|
||||||
import org.elasticsearch.watcher.watch.Watch;
|
import org.elasticsearch.watcher.watch.Watch;
|
||||||
|
import org.elasticsearch.watcher.watch.WatchStore;
|
||||||
import org.hamcrest.Matcher;
|
import org.hamcrest.Matcher;
|
||||||
import org.jboss.netty.util.internal.SystemPropertyUtil;
|
import org.jboss.netty.util.internal.SystemPropertyUtil;
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
|
@ -114,6 +114,15 @@ public abstract class AbstractWatcherIntegrationTestCase extends ESIntegTestCase
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Set<String> excludeTemplates() {
|
||||||
|
Set<String> excludes = new HashSet<>();
|
||||||
|
for (WatcherIndexTemplateRegistry.TemplateConfig templateConfig : WatcherModule.TEMPLATE_CONFIGS) {
|
||||||
|
excludes.add(templateConfig.getTemplateName());
|
||||||
|
}
|
||||||
|
return excludes;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Collection<Class<? extends Plugin>> nodePlugins() {
|
protected Collection<Class<? extends Plugin>> nodePlugins() {
|
||||||
return pluginTypes();
|
return pluginTypes();
|
||||||
|
|
Loading…
Reference in New Issue