1
0
Fork 0

unified naming (all_ok, ok => status)

This commit is contained in:
Frank Celler 2016-02-04 12:34:14 +01:00
parent 0ff20a6590
commit ea040037cb
2 changed files with 10 additions and 15 deletions

View File

@ -196,12 +196,12 @@ function main(argv) {
}
_.defaults(r, {
all_ok: false,
status: false,
crashed: true
});
// whether or not there was an error
fs.write("out/UNITTEST_RESULT_EXECUTIVE_SUMMARY.json", String(r.all_ok));
fs.write("out/UNITTEST_RESULT_EXECUTIVE_SUMMARY.json", String(r.status));
if (options.writeXmlReport) {
fs.write("out/UNITTEST_RESULT.json", inspect(r));

View File

@ -1729,7 +1729,6 @@ const internalMembers = [
"failed",
"total",
"crashed",
"all_ok",
"ok",
"message",
"suiteName"
@ -3020,9 +3019,9 @@ function unitTestPrettyPrintResults(r) {
print(fail);
}
print("Overall state: " + ((r.all_ok === true) ? "Success" : "Fail"));
print("Overall state: " + ((r.status === true) ? "Success" : "Fail"));
if (r.all_ok !== true) {
if (r.status !== true) {
print(" Suites failed: " + testSuiteFail + " Tests Failed: " + testFail);
}
@ -3098,7 +3097,7 @@ function unitTest(which, options) {
return {
ok: false,
all_ok: false
status: false
};
}
@ -3132,11 +3131,9 @@ function unitTest(which, options) {
if (!ok) {
allok = false;
}
results.all_ok = allok;
}
results.all_ok = allok;
results.status = allok;
results.crashed = serverCrashed;
if (allok) {
@ -3166,8 +3163,7 @@ function unitTest(which, options) {
print(line);
return {
ok: false,
all_ok: false
status: false
};
}
@ -3192,8 +3188,8 @@ function unitTest(which, options) {
}
}
thisReply.ok = ok;
results.all_ok = ok;
thisReply.status = ok;
results.status = ok;
results.crashed = serverCrashed;
if (allok) {
@ -3212,8 +3208,7 @@ function unitTest(which, options) {
}
return {
ok: false,
all_ok: false
status: false
};
}