-
Notifications
You must be signed in to change notification settings - Fork 24.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Watcher: Fold two smoke test projects into smoke-test-watcher (#30137)
In order to have less qa/ projects, this commit removes the watcher-smoke-test-mustache and the watcher-smoke-test-painless projects and moves the tests of both into the watcher-smoke-test projects. This results in less projects to parse when calling gradle and a shorter test time due to being able to run everything within one elasticsearch instance.
- Loading branch information
Showing
19 changed files
with
98 additions
and
177 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
75 changes: 0 additions & 75 deletions
75
...atcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherWithMustacheIT.java
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
74 changes: 0 additions & 74 deletions
74
...atcher-with-painless/src/test/java/org/elasticsearch/smoketest/WatcherWithPainlessIT.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
x-pack/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/WatcherRestIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
package org.elasticsearch.smoketest; | ||
|
||
import com.carrotsearch.randomizedtesting.annotations.Name; | ||
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; | ||
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; | ||
import org.elasticsearch.test.rest.yaml.ClientYamlTestResponse; | ||
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; | ||
import org.elasticsearch.xpack.core.watcher.support.WatcherIndexTemplateRegistryField; | ||
import org.junit.After; | ||
import org.junit.Before; | ||
|
||
import static java.util.Collections.emptyList; | ||
import static java.util.Collections.emptyMap; | ||
import static java.util.Collections.singletonMap; | ||
import static org.hamcrest.Matchers.is; | ||
|
||
/** Runs rest tests against external cluster */ | ||
public class WatcherRestIT extends ESClientYamlSuiteTestCase { | ||
|
||
public WatcherRestIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { | ||
super(testCandidate); | ||
} | ||
|
||
@ParametersFactory | ||
public static Iterable<Object[]> parameters() throws Exception { | ||
return ESClientYamlSuiteTestCase.createParameters(); | ||
} | ||
|
||
@Before | ||
public void startWatcher() throws Exception { | ||
assertBusy(() -> { | ||
ClientYamlTestResponse response = | ||
getAdminExecutionContext().callApi("xpack.watcher.stats", emptyMap(), emptyList(), emptyMap()); | ||
String state = (String) response.evaluate("stats.0.watcher_state"); | ||
|
||
switch (state) { | ||
case "stopped": | ||
ClientYamlTestResponse startResponse = | ||
getAdminExecutionContext().callApi("xpack.watcher.start", emptyMap(), emptyList(), emptyMap()); | ||
boolean isAcknowledged = (boolean) startResponse.evaluate("acknowledged"); | ||
assertThat(isAcknowledged, is(true)); | ||
break; | ||
case "stopping": | ||
throw new AssertionError("waiting until stopping state reached stopped state to start again"); | ||
case "starting": | ||
throw new AssertionError("waiting until starting state reached started state"); | ||
case "started": | ||
// all good here, we are done | ||
break; | ||
default: | ||
throw new AssertionError("unknown state[" + state + "]"); | ||
} | ||
}); | ||
|
||
assertBusy(() -> { | ||
for (String template : WatcherIndexTemplateRegistryField.TEMPLATE_NAMES) { | ||
ClientYamlTestResponse templateExistsResponse = getAdminExecutionContext().callApi("indices.exists_template", | ||
singletonMap("name", template), emptyList(), emptyMap()); | ||
assertThat(templateExistsResponse.getStatusCode(), is(200)); | ||
} | ||
}); | ||
} | ||
|
||
@After | ||
public void stopWatcher() throws Exception { | ||
assertBusy(() -> { | ||
ClientYamlTestResponse response = | ||
getAdminExecutionContext().callApi("xpack.watcher.stats", emptyMap(), emptyList(), emptyMap()); | ||
String state = (String) response.evaluate("stats.0.watcher_state"); | ||
|
||
switch (state) { | ||
case "stopped": | ||
// all good here, we are done | ||
break; | ||
case "stopping": | ||
throw new AssertionError("waiting until stopping state reached stopped state"); | ||
case "starting": | ||
throw new AssertionError("waiting until starting state reached started state to stop"); | ||
case "started": | ||
ClientYamlTestResponse stopResponse = | ||
getAdminExecutionContext().callApi("xpack.watcher.stop", emptyMap(), emptyList(), emptyMap()); | ||
boolean isAcknowledged = (boolean) stopResponse.evaluate("acknowledged"); | ||
assertThat(isAcknowledged, is(true)); | ||
break; | ||
default: | ||
throw new AssertionError("unknown state[" + state + "]"); | ||
} | ||
}); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.