Merge pull request elastic/elasticsearch#2576 from javanna/fix/xpack-rest-testcase-watcher

[TEST] remove start and stop watcher from XPackRestTestCase

Original commit: elastic/x-pack-elasticsearch@192be0db8b
This commit is contained in:
Luca Cavanna 2016-06-27 14:52:39 +02:00 committed by GitHub
commit b5bb2d2fdc
1 changed files with 0 additions and 19 deletions

View File

@ -8,7 +8,6 @@ package org.elasticsearch.xpack.test.rest;
import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.Name;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import org.elasticsearch.client.ResponseException;
import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
@ -51,24 +50,6 @@ public abstract class XPackRestTestCase extends ESRestTestCase {
return ESRestTestCase.createParameters(0, 1); return ESRestTestCase.createParameters(0, 1);
} }
@Before
public void startWatcher() throws Exception {
try {
getAdminExecutionContext().callApi("xpack.watcher.start", emptyMap(), emptyList(), emptyMap());
} catch(ResponseException e) {
//TODO ignore for now, needs to be fixed though
}
}
@After
public void stopWatcher() throws Exception {
try {
getAdminExecutionContext().callApi("xpack.watcher.stop", emptyMap(), emptyList(), emptyMap());
} catch(ResponseException e) {
//TODO ignore for now, needs to be fixed though
}
}
@Before @Before
public void installLicense() throws Exception { public void installLicense() throws Exception {
final XContentBuilder builder = XContentFactory.jsonBuilder(); final XContentBuilder builder = XContentFactory.jsonBuilder();