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

Relax timeout of tests if running with valgrind.

This commit is contained in:
Willi Goesgens 2015-01-28 14:18:49 +01:00
parent e24278828c
commit b859e4a54d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1454,7 +1454,14 @@ testFuncs.authentication_parameters = function (options) {
var expectAuthFullRC = [401, 401, 401, 401, 401, 401, 401]; var expectAuthFullRC = [401, 401, 401, 401, 401, 401, 401];
var all_ok = true; var all_ok = true;
var continueTesting = true; var continueTesting = true;
var downloadOptions = {
followRedirects:false,
returnBodyOnError:true
};
if (typeof(options.valgrind) === 'string') {
downloadOptions.timeout = 300;
}
print("Starting Full test"); print("Starting Full test");
results.auth_full = {}; results.auth_full = {};
for (i = 0; i < urlsTodo.length; i++) { for (i = 0; i < urlsTodo.length; i++) {
@ -1467,7 +1474,7 @@ testFuncs.authentication_parameters = function (options) {
continue; continue;
} }
r = download(instanceInfo.url+urlsTodo[i],"",{followRedirects:false,returnBodyOnError:true}); r = download(instanceInfo.url+urlsTodo[i],"", downloadOptions);
if (r.code === expectAuthFullRC[i]) { if (r.code === expectAuthFullRC[i]) {
results.auth_full[urlsTodo[i]] = { status: true, message: ""}; results.auth_full[urlsTodo[i]] = { status: true, message: ""};
} }
@ -1507,7 +1514,7 @@ testFuncs.authentication_parameters = function (options) {
all_ok = false; all_ok = false;
continue; continue;
} }
r = download(instanceInfo.url+urlsTodo[i],"",{followRedirects:false,returnBodyOnError:true}); r = download(instanceInfo.url+urlsTodo[i],"", downloadOptions);
if (r.code === expectAuthSystemRC[i]) { if (r.code === expectAuthSystemRC[i]) {
results.auth_system[urlsTodo[i]] = { status: true, message: ""}; results.auth_system[urlsTodo[i]] = { status: true, message: ""};
} }
@ -1548,7 +1555,7 @@ testFuncs.authentication_parameters = function (options) {
continue; continue;
} }
r = download(instanceInfo.url+urlsTodo[i],"",{followRedirects:false,returnBodyOnError:true}); r = download(instanceInfo.url+urlsTodo[i],"", downloadOptions);
if (r.code === expectAuthNoneRC[i]) { if (r.code === expectAuthNoneRC[i]) {
results.auth_none[urlsTodo[i]] = { status: true, message: ""}; results.auth_none[urlsTodo[i]] = { status: true, message: ""};
} }