1
0
Fork 0
This commit is contained in:
Frank Celler 2016-04-14 21:46:28 -07:00
parent 8254bd4bd6
commit 6c0ebb1637
1 changed files with 16 additions and 8 deletions

View File

@ -118,6 +118,8 @@ const optionsDocumentation = [
' DBServer - flag to run DBServers with valgrind', ' DBServer - flag to run DBServers with valgrind',
'', '',
' - `extraArgs`: list of extra commandline arguments to add to arangod', ' - `extraArgs`: list of extra commandline arguments to add to arangod',
'',
' - `verbose`: if set to true, be more verbose',
' - `extremeVerbosity`: if set to true, then there will be more test run', ' - `extremeVerbosity`: if set to true, then there will be more test run',
' output, especially for cluster tests.', ' output, especially for cluster tests.',
'' ''
@ -164,6 +166,7 @@ const optionsDefaults = {
"valgrindFileBase": "", "valgrindFileBase": "",
"valgrindArgs": {}, "valgrindArgs": {},
"valgrindHosts": false, "valgrindHosts": false,
"verbose": false,
"writeXmlReport": true "writeXmlReport": true
}; };
@ -279,6 +282,7 @@ function makeArgsArangod(options, appDir) {
"javascript.app-path": appDir, "javascript.app-path": appDir,
"javascript.startup-directory": JS_DIR, "javascript.startup-directory": JS_DIR,
"javascript.v8-contexts": "5", "javascript.v8-contexts": "5",
"log.level": "warning",
"server.allow-use-database": "true", "server.allow-use-database": "true",
"server.authentication": "false", "server.authentication": "false",
"server.threads": "20", "server.threads": "20",
@ -1645,7 +1649,7 @@ function startInstanceAgency(instanceInfo, protocol, options,
} }
l.push("--agency.notify"); l.push("--agency.notify");
l.push("true"); l.push("true");
args["flatCommands"] = l; args["flatCommands"] = l;
} }
argss.push(args); argss.push(args);
@ -2476,7 +2480,7 @@ testFuncs.authentication = function(options) {
print("Authentication tests..."); print("Authentication tests...");
let instanceInfo = startInstance("tcp", options, { let instanceInfo = startInstance("tcp", options, {
"server.disable-authentication": "false" "server.authentication": "true"
}, "authentication"); }, "authentication");
if (instanceInfo === false) { if (instanceInfo === false) {
@ -2534,13 +2538,13 @@ const authTestNames = [
]; ];
const authTestServerParams = [{ const authTestServerParams = [{
"server.disable-authentication": "false", "server.authentication": "true",
"server.authenticate-system-only": "false" "server.authenticate-system-only": "false"
}, { }, {
"server.disable-authentication": "false", "server.authentication": "true",
"server.authenticate-system-only": "true" "server.authenticate-system-only": "true"
}, { }, {
"server.disable-authentication": "true", "server.authentication": "false",
"server.authenticate-system-only": "true" "server.authenticate-system-only": "true"
}]; }];
@ -2896,7 +2900,7 @@ testFuncs.dump_authentication = function(options) {
print("dump_authentication tests..."); print("dump_authentication tests...");
const auth1 = { const auth1 = {
"server.disable-authentication": "false" "server.authentication": "true"
}; };
const auth2 = { const auth2 = {
@ -3407,7 +3411,7 @@ testFuncs.replication_static = function(options) {
const mr = makeResults('replication'); const mr = makeResults('replication');
let master = startInstance("tcp", options, { let master = startInstance("tcp", options, {
"server.disable-authentication": "false" "server.authentication": "true"
}, "master_static"); }, "master_static");
if (master === false) { if (master === false) {
@ -4249,7 +4253,11 @@ function unitTest(cases, options) {
for (let n = 0; n < caselist.length; ++n) { for (let n = 0; n < caselist.length; ++n) {
const currentTest = caselist[n]; const currentTest = caselist[n];
print("Executing test", currentTest, "with options", options); if (options.verbose) {
print("Executing test", currentTest, "with options", options);
} else {
print("Executing test", currentTest);
}
let result = testFuncs[currentTest](options); let result = testFuncs[currentTest](options);
results[currentTest] = result; results[currentTest] = result;