1
0
Fork 0

agency supervision turned off for quickietest

This commit is contained in:
Kaveh Vahedipour 2016-09-09 15:03:12 +02:00
parent b98975344d
commit 8b6f0e1f51
2 changed files with 5 additions and 3 deletions

View File

@ -102,6 +102,7 @@ const optionsDocumentation = [
' - `coordinators`: number coordinators to use',
' - `agency`: if set to true agency tests are done',
' - `agencySize`: number of agents in agency',
' - `agencySupervision`: run supervision in agency',
' - `test`: path to single test to execute for "single" test target',
' - `cleanup`: if set to true (the default), the cluster data files',
' and logs are removed after termination of the test.',
@ -136,6 +137,7 @@ const optionsDocumentation = [
const optionsDefaults = {
'agencySize': 3,
'agencySupervision': true,
'build': '',
'buildType': '',
'cleanup': true,
@ -1301,7 +1303,6 @@ function startInstanceCluster (instanceInfo, protocol, options,
return [subArgs, subDir];
};
// options.agencySize = 1
options.agencyWaitForSync = false;
startInstanceAgency(instanceInfo, protocol, options, ...makeArgs('agency', {}));
@ -1437,6 +1438,7 @@ function startInstanceAgency (instanceInfo, protocol, options,
const dataDir = fs.join(rootDir, 'data');
const N = options.agencySize;
const S = options.agencySupervision;
if (options.agencyWaitForSync === undefined) {
options.agencyWaitForSync = false;
}
@ -1448,7 +1450,7 @@ function startInstanceAgency (instanceInfo, protocol, options,
instanceArgs['agency.size'] = String(N);
instanceArgs['agency.pool-size'] = String(N);
instanceArgs['agency.wait-for-sync'] = String(wfs);
instanceArgs['agency.supervision'] = 'true';
instanceArgs['agency.supervision'] = String(S);
instanceArgs['database.directory'] = dataDir + String(i);
if (i === N - 1) {

View File

@ -1,5 +1,5 @@
#!/bin/bash
scripts/unittest shell_server --test js/common/tests/shell/shell-quickie.js
scripts/unittest shell_server --test js/common/tests/shell/shell-quickie.js --cluster true
scripts/unittest shell_server --test js/common/tests/shell/shell-quickie.js --cluster true --agencySupervision false
scripts/unittest shell_client --test js/common/tests/shell/shell-quickie.js
scripts/unittest shell_client --test js/common/tests/shell/shell-quickie.js --cluster true --agencySize 1