1
0
Fork 0

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2014-10-07 12:00:57 +02:00
commit 38c6021463
1 changed files with 7 additions and 0 deletions

View File

@ -1114,6 +1114,8 @@ function unitTestPrettyPrintResults(r) {
var testrun; var testrun;
var test; var test;
var oneTest; var oneTest;
var testFail = 0;
var testSuiteFail = 0;
try { try {
for (testrun in r) { for (testrun in r) {
@ -1125,6 +1127,7 @@ function unitTestPrettyPrintResults(r) {
print(" " + test + ": Success"); print(" " + test + ": Success");
} }
else { else {
testSuiteFail += 1;
if (r[testrun][test].hasOwnProperty('message')) { if (r[testrun][test].hasOwnProperty('message')) {
print(" " + test + ": Fail - Whole testsuite failed!"); print(" " + test + ": Fail - Whole testsuite failed!");
if (typeof r[testrun][test].message === "object" && if (typeof r[testrun][test].message === "object" &&
@ -1141,6 +1144,7 @@ function unitTestPrettyPrintResults(r) {
if ((r[testrun][test].hasOwnProperty(oneTest)) && if ((r[testrun][test].hasOwnProperty(oneTest)) &&
(internalMembers.indexOf(oneTest) === -1) && (internalMembers.indexOf(oneTest) === -1) &&
(!r[testrun][test][oneTest].status)) { (!r[testrun][test][oneTest].status)) {
testFail =+ 1;
print(" -> " + oneTest + " Failed; Verbose message:"); print(" -> " + oneTest + " Failed; Verbose message:");
print(r[testrun][test][oneTest].message); print(r[testrun][test][oneTest].message);
} }
@ -1152,6 +1156,9 @@ function unitTestPrettyPrintResults(r) {
} }
} }
print("Overall state: " + ((r.all_ok === true) ? "Success" : "Fail")); print("Overall state: " + ((r.all_ok === true) ? "Success" : "Fail"));
if ((r.all_ok !== true) {
print(" Suites failed: " + testSuiteFail + " Tests Failed: " + testFail);
}
} }
catch (x) { catch (x) {
print("exception caught while pretty printing result: "); print("exception caught while pretty printing result: ");