honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reenable watcher rest tests (#53532) 

Also log a message instead of failing if there are active watches at a beginning of a test.

Relates to #53177
This commit is contained in:
Martijn van Groningen 2020-03-13 15:13:26 +01:00
parent 7e82a4f78c
commit 3b9545848f
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x-pack/plugin/watcher/qa/rest/src/test/java/org/elasticsearch/smoketest/WatcherYamlRestIT.java
View File

@ -5,14 +5,12 @@
*/
package org.elasticsearch.smoketest;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
import org.elasticsearch.xpack.watcher.WatcherYamlSuiteTestCase;
/**
* Runs the YAML rest tests against an external cluster
*/
@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/53177")
public class WatcherYamlRestIT extends WatcherYamlSuiteTestCase {
public WatcherYamlRestIT(ClientYamlTestCandidate testCandidate) {
super(testCandidate);

10
x-pack/plugin/watcher/qa/rest/src/test/java/org/elasticsearch/xpack/watcher/WatcherYamlSuiteTestCase.java
View File

@ -14,11 +14,11 @@ import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
import org.junit.After;
import org.junit.Before;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
/**
@ -54,7 +54,10 @@ public abstract class WatcherYamlSuiteTestCase extends ESClientYamlSuiteTestCase
throw new AssertionError("waiting until starting state reached started state");
case "started":
int watcherCount = (int) response.evaluate("stats.0.watch_count");
assertThat(watcherCount, equalTo(0));
if (watcherCount > 0) {
logger.info("expected 0 active watches, but got [{}], deleting watcher indices again", watcherCount);
deleteWatcherIndices();
}
// all good here, we are done
break;
default:
@ -88,7 +91,10 @@ public abstract class WatcherYamlSuiteTestCase extends ESClientYamlSuiteTestCase
throw new AssertionError("unknown state[" + state + "]");
}
}, 60, TimeUnit.SECONDS);
deleteWatcherIndices();
}
private static void deleteWatcherIndices() throws IOException {
Request deleteWatchesIndexRequest = new Request("DELETE", ".watches");
deleteWatchesIndexRequest.addParameter("ignore_unavailable", "true");
adminClient().performRequest(deleteWatchesIndexRequest);

2
x-pack/plugin/watcher/qa/with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityClientYamlTestSuiteIT.java
View File

@ -7,7 +7,6 @@ package org.elasticsearch.smoketest;
import com.carrotsearch.randomizedtesting.annotations.Name;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.client.Request;
import org.elasticsearch.common.settings.SecureString;
import org.elasticsearch.common.settings.Settings;
@ -19,7 +18,6 @@ import org.junit.Before;
import static org.elasticsearch.xpack.test.SecuritySettingsSourceField.basicAuthHeaderValue;
@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/53177")
public class SmokeTestWatcherWithSecurityClientYamlTestSuiteIT extends WatcherYamlSuiteTestCase {
private static final String TEST_ADMIN_USERNAME = "test_admin";