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

[TEST] Ensure a well-defined cleanup order for YAML tests (elastic/x-pack-elasticsearch#1585) 

Previously there were two @After methods in the XPackRestIT class, and
there is no guarantee about the order in which these run.  This commit
replaces these with a single @After method that calls the cleanup methods
in a well-defined order.

Original commit: elastic/x-pack-elasticsearch@d3ab366591
This commit is contained in:
David Roberts 2017-05-30 13:19:06 +01:00 committed by GitHub
parent e177f79aa3
commit 374e54233d
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
plugin/src/test/java/org/elasticsearch/xpack/test/rest/XPackRestIT.java
View File

@ -37,11 +37,6 @@ import static java.util.Collections.singletonMap;
/** Runs rest tests against external cluster */
public class XPackRestIT extends XPackRestTestCase {
@After
public void clearMlState() throws Exception {
new MlRestTestStateCleaner(logger, adminClient(), this).clearMlMetadata();
}
public XPackRestIT(ClientYamlTestCandidate testCandidate) {
super(testCandidate);
}
@ -89,10 +84,24 @@ public class XPackRestIT extends XPackRestTestCase {
}
/**
* Disable monitoring
* Cleanup after tests.
*
* Feature-specific cleanup methods should be called from here rather than using
* separate @After annotated methods to ensure there is a well-defined cleanup order.
*/
@After
public void disableMonitoring() throws Exception {
public void cleanup() throws Exception {
disableMonitoring();
// This also generically waits for pending tasks to complete, so must go last (otherwise
// it could be waiting for pending tasks while monitoring is still running).
// TODO: consider moving the bit that waits for pending tasks into a general X-Pack component
clearMlState();
}
/**
* Disable monitoring
*/
private void disableMonitoring() throws Exception {
if (isMonitoringTest()) {
final Map<String, Object> settings = new HashMap<>();
settings.put("xpack.monitoring.collection.interval", (String) null);
@ -142,6 +151,16 @@ public class XPackRestIT extends XPackRestTestCase {
}
}
/**
* Delete any left over machine learning datafeeds and jobs.
*
* Also waits for pending tasks to complete (which is not really an ML-specific
* thing and could be moved into a general X-Pack method at some point).
*/
private void clearMlState() throws Exception {
new MlRestTestStateCleaner(logger, adminClient(), this).clearMlMetadata();
}
/**
* Executes an API call using the admin context, waiting for it to succeed.
*/