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

If we fail tests, disable cleanup in all cases.

This commit is contained in:
Willi Goesgens 2015-01-21 11:41:54 +01:00
parent 6e20887e30
commit 63d381a9ed
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -760,6 +760,9 @@ function performTests(options, testList, testname, remote) {
}
if (r.hasOwnProperty('status')) {
results[te] = r;
if (results[te].status === false) {
options.cleanup = false;
}
if (! r.status && ! options.force) {
break;
}
@ -814,6 +817,9 @@ testFuncs.single_server = function (options) {
result = {};
result[te] = runThere(options, instanceInfo, makePath(te));
print("Shutting down...");
if (result[te].status === false) {
options.cleanup = false;
}
shutdownInstance(instanceInfo,options);
print("done.");
return result;
@ -832,6 +838,9 @@ testFuncs.single_localserver = function (options) {
print("\nArangod: Trying",te,"...");
result = {};
result[te] = runHere(options, instanceInfo, makePath(te));
if (result[te].status === false) {
options.cleanup = false;
}
return result;
}
else {
@ -850,7 +859,11 @@ testFuncs.single_client = function (options) {
var te = options.test;
print("\narangosh: Trying ",te,"...");
result[te] = runInArangosh(options, instanceInfo, te);
print("Shutting down...");
if (result[te].status === false) {
options.cleanup = false;
}
shutdownInstance(instanceInfo,options);
print("done.");
return result;
@ -954,8 +967,11 @@ testFuncs.shell_client = function(options) {
var r = runInArangosh(options, instanceInfo, te);
results[te] = r;
if (r.status !== true && ! options.force) {
break;
if (r.status !== true) {
options.cleanup = false;
if (! options.force) {
break;
}
}
continueTesting = checkInstanceAlive(instanceInfo, options);
@ -1072,8 +1088,11 @@ function rubyTests (options, ssl) {
print("\nTrying ",te,"...");
result[te] = executeAndWait(command, args);
if (result[te].status === false && !options.force) {
break;
if (result[te].status === false) {
options.cleanup = false;
if (!options.force) {
break;
}
}
continueTesting = checkInstanceAlive(instanceInfo, options);