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 data-modification

This commit is contained in:
Jan Steemann 2015-03-24 11:12:05 +01:00
parent 16348cd10c 3b773c0c49
commit 95defabf05
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1619,8 +1619,8 @@ testFuncs.arangob = function (options) {
for (i = 0; i < benchTodo.length; i++) { for (i = 0; i < benchTodo.length; i++) {
// On the cluster we do not yet have working transaction functionality: // On the cluster we do not yet have working transaction functionality:
if (! options.cluster || if (! options.cluster ||
(benchTodo[i].indexOf("counttrx") === -1 && (benchTodo[i].test !== "counttrx" &&
benchTodo[i].indexOf("multitrx") === -1)) { benchTodo[i].test !== "multitrx")) {
if (!continueTesting) { if (!continueTesting) {
print("Skipping " + benchTodo[i] + ", server is gone."); print("Skipping " + benchTodo[i] + ", server is gone.");