Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Jan Steemann 2015-01-13 19:12:03 +01:00
parent 7d178ef9c1 cf2abccde8
commit cc829e2b0d
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/server/modules/org/arangodb/testing.js
View File

@ -1129,8 +1129,13 @@ var impTodo = [
testFuncs.importing = function (options) { testFuncs.importing = function (options) {
if (options.cluster) { if (options.cluster) {
print("Skipped because of cluster."); print("Skipped because of cluster.");
return {"importing": {"status":true, "skipped":true, return {"importing":
"message": "skipped because of cluster"}}; {
"status" : true,
"message": "skipped because of cluster",
"skipped": true
}
};
} }
var instanceInfo = startInstance("tcp", options, [ ], "importing"); var instanceInfo = startInstance("tcp", options, [ ], "importing");

14
scripts/unittest.js
View File

@ -46,14 +46,22 @@ function resultsToXml(results, baseName) {
} }
for (var testrun in results) { for (var testrun in results) {
if (results.hasOwnProperty(testrun)) { if ((testrun !== "all_ok") && (results.hasOwnProperty(testrun))) {
for (var test in results[testrun]) { for (var test in results[testrun]) {
if (results[testrun].hasOwnProperty(test)) {
if ((test !== "ok") &&
results[testrun].hasOwnProperty(test) &&
!results[testrun][test].hasOwnProperty('skipped')) {
var xml = buildXml(); var xml = buildXml();
var failuresFound = "";
if (results[testrun][test].hasOwnProperty('failed')) {
failuresFound = results[testrun][test].failed;
}
xml.elem("testsuite", { xml.elem("testsuite", {
errors: 0, errors: 0,
failures: results[testrun][test].failed, failures: failuresFound,
name: test, name: test,
tests: results[testrun][test].total, tests: results[testrun][test].total,
time: results[testrun][test].duration time: results[testrun][test].duration