honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-27 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

iter

Browse Source
This commit is contained in:
Martijn van Groningen 2018-02-12 11:59:12 +01:00
parent 21e5ee6551
commit c19d84012e
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
1 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java
View File

@ -308,14 +308,7 @@ public abstract class ESClientYamlSuiteTestCase extends ESRestTestCase {
if (!testCandidate.getSetupSection().isEmpty()) {
logger.debug("start setup test [{}]", testCandidate.getTestPath());
for (DoSection doSection : testCandidate.getSetupSection().getDoSections()) {
try {
executeSection(doSection);
} catch (AssertionError | Exception e) {
logger.info("Stash dump on setup failure [{}]",
Strings.toString(restTestExecutionContext.stash(), true, true)
.replace("\\n", "\n").replace("\\r", "\r").replace("\\t", "\t"));
throw e;
}
executeSection(doSection);
}
logger.debug("end setup test [{}]", testCandidate.getTestPath());
}
@ -324,27 +317,12 @@ public abstract class ESClientYamlSuiteTestCase extends ESRestTestCase {
try {
for (ExecutableSection executableSection : testCandidate.getTestSection().getExecutableSections()) {
try {
executeSection(executableSection);
} catch (AssertionError | Exception e) {
// Dump the stash on failure. Instead of dumping it in true json we escape `\n`s so stack traces are easier to read
logger.info("Stash dump on test failure [{}]",
Strings.toString(restTestExecutionContext.stash(), true, true)
.replace("\\n", "\n").replace("\\r", "\r").replace("\\t", "\t"));
throw e;
}
executeSection(executableSection);
}
} finally {
logger.debug("start teardown test [{}]", testCandidate.getTestPath());
for (DoSection doSection : testCandidate.getTeardownSection().getDoSections()) {
try {
executeSection(doSection);
} catch (AssertionError | Exception e) {
logger.info("Stash dump on tear down failure [{}]",
Strings.toString(restTestExecutionContext.stash(), true, true)
.replace("\\n", "\n").replace("\\r", "\r").replace("\\t", "\t"));
// Don't rethrow exception here, that could hide the exception caused by a test.
}
executeSection(doSection);
}
logger.debug("end teardown test [{}]", testCandidate.getTestPath());
}
@ -356,10 +334,16 @@ public abstract class ESClientYamlSuiteTestCase extends ESRestTestCase {
private void executeSection(ExecutableSection executableSection) {
try {
executableSection.execute(restTestExecutionContext);
} catch (Exception e) {
throw new RuntimeException(errorMessage(executableSection, e), e);
} catch (AssertionError e) {
throw new AssertionError(errorMessage(executableSection, e), e);
} catch (AssertionError | Exception e) {
// Dump the stash on failure. Instead of dumping it in true json we escape `\n`s so stack traces are easier to read
logger.info("Stash dump on test failure [{}]",
Strings.toString(restTestExecutionContext.stash(), true, true)
.replace("\\n", "\n").replace("\\r", "\r").replace("\\t", "\t"));
if (e instanceof AssertionError) {
throw new AssertionError(errorMessage(executableSection, e), e);
} else {
throw new RuntimeException(errorMessage(executableSection, e), e);
}
}
}