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 agency-startup

This commit is contained in:
Kaveh Vahedipour 2016-08-11 12:06:00 +02:00
parent 4759b2a434 2c8e9ba3a9
commit fb846e7cda
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -649,9 +649,6 @@ function runThere (options, instanceInfo, file) {
'return runTest(' + JSON.stringify(file) + ', true);'; 'return runTest(' + JSON.stringify(file) + ', true);';
} }
if (options.propagateInstanceInfo) {
}
let httpOptions = makeAuthorizationHeaders(options); let httpOptions = makeAuthorizationHeaders(options);
httpOptions.method = 'POST'; httpOptions.method = 'POST';
httpOptions.timeout = 3600; httpOptions.timeout = 3600;
@ -3378,7 +3375,6 @@ testFuncs.replication_sync = function (options) {
testFuncs.resilience = function (options) { testFuncs.resilience = function (options) {
findTests(); findTests();
options.propagateInstanceInfo = true;
options.cluster = true; options.cluster = true;
if (options.dbServers < 5) { if (options.dbServers < 5) {
options.dbServers = 5; options.dbServers = 5;
@ -3392,7 +3388,6 @@ testFuncs.resilience = function (options) {
testFuncs.client_resilience = function (options) { testFuncs.client_resilience = function (options) {
findTests(); findTests();
options.propagateInstanceInfo = true;
options.cluster = true; options.cluster = true;
if (options.coordinators < 2) { if (options.coordinators < 2) {
options.coordinators = 2; options.coordinators = 2;
@ -3442,7 +3437,6 @@ testFuncs.server_http = function (options) {
testFuncs.shell_server = function (options) { testFuncs.shell_server = function (options) {
findTests(); findTests();
options.propagateInstanceInfo = true;
return performTests(options, testsCases.server, 'shell_server', runThere); return performTests(options, testsCases.server, 'shell_server', runThere);
}; };
@ -3764,10 +3758,18 @@ testFuncs.stress_locks = function (options) {
testFuncs.agency = function (options) { testFuncs.agency = function (options) {
findTests(); findTests();
let saveAgency = options.agency;
let saveCluster = options.cluster;
options.agency = true; options.agency = true;
options.cluster = false; options.cluster = false;
return performTests(options, testsCases.agency, 'agency', createArangoshRunner()); let results = performTests(options, testsCases.agency, 'agency', createArangoshRunner());
options.agency = saveAgency;
options.cluster = saveCluster;
return results;
}; };
// ////////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////////