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/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2016-02-08 09:57:19 +01:00
parent b7941f3142 3463a2af64
commit 00bffcda28
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/Books/Users/AqlExtending/Conventions.mdpp
View File

@ -117,7 +117,9 @@ Any violation of the strict mode will trigger a runtime error.
Internally, user functions are stored in a system collection named Internally, user functions are stored in a system collection named
*_aqlfunctions* of the selected database. *_aqlfunctions* of the selected database.
That means that by default they are excluded from dumps Documents in this collection should not be accessed directly, but
created with [arangodump](../HttpBulkImports/Arangodump.md). only via the dedicated interfaces.
To include AQL user functions in a dump, the dump should be started Also system collection are excluded from dumps created with
with the option *--include-system-collections true*. [arangodump](../HttpBulkImports/Arangodump.md). To include AQL user
functions in a dump, the dump should be started with the
option *--include-system-collections true*.

16
js/client/modules/@arangodb/testing.js
View File

@ -2996,6 +2996,7 @@ const recoveryTests = [
testFuncs.recovery = function(options) { testFuncs.recovery = function(options) {
let results = {}; let results = {};
let status = true;
for (let i = 0; i < recoveryTests.length; ++i) { for (let i = 0; i < recoveryTests.length; ++i) {
let test = recoveryTests[i]; let test = recoveryTests[i];
@ -3010,9 +3011,17 @@ testFuncs.recovery = function(options) {
} }
results[test] = instanceInfo.pid; results[test] = instanceInfo.pid;
if (!results[test].status) {
status = false;
}
} }
return results; results.status = status;
return {
recovery: results
};
}; };
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -3852,7 +3861,6 @@ function unitTest(which, options) {
if (thisReply.hasOwnProperty(i)) { if (thisReply.hasOwnProperty(i)) {
if (thisReply[i].status !== true) { if (thisReply[i].status !== true) {
ok = false; ok = false;
allok = false;
} }
} }
} }
@ -3861,7 +3869,7 @@ function unitTest(which, options) {
results.status = ok; results.status = ok;
results.crashed = serverCrashed; results.crashed = serverCrashed;
if (allok) { if (ok) {
cleanupDBDirectories(options); cleanupDBDirectories(options);
} else { } else {
print("since some tests weren't successfully, not cleaning up: \n" + print("since some tests weren't successfully, not cleaning up: \n" +
@ -3873,7 +3881,7 @@ function unitTest(which, options) {
if (jsonReply === true) { if (jsonReply === true) {
return results; return results;
} else { } else {
return allok; return ok;
} }
} }