YUKI Hiroshi
null+****@clear*****
Fri Nov 9 15:59:13 JST 2012
YUKI Hiroshi 2012-11-09 15:59:13 +0900 (Fri, 09 Nov 2012) New Revision: 8fdccbfaae41852c16b8cd4055febf234b72f763 https://github.com/groonga/gcs/commit/8fdccbfaae41852c16b8cd4055febf234b72f763 Log: Add setup process (only for GCS) Modified files: bin/gcs-run-scenarios test/fixture/response/configuration/CreateDomain.json test/fixture/response/configuration/DeleteDomain.json Modified: bin/gcs-run-scenarios (+17 -10) =================================================================== --- bin/gcs-run-scenarios 2012-11-09 15:54:17 +0900 (c7c06e5) +++ bin/gcs-run-scenarios 2012-11-09 15:59:13 +0900 (4f35ebe) @@ -90,6 +90,22 @@ function processScenario(params, callback) { if (!params.start) params.start = Date.now(); var request = params.requests.shift(); + function processNext() { + if (params.requests.length) { + processScenario(params, callback); + } else { + var elapsedTime = Date.now() - params.start; + console.log(' Done. (elapsed time: ' + elapsedTime + 'msec)'); + if (callback) + callback(null); + else + process.exit(0); + } + } + + if (request.onlyCGS && commandLine.options.acs) + return processNext(); + console.log(' Processing request: ' + request.name); var filename = request.name.replace(/[^a-zA-Z0-9]+/g, '-') + '.txt'; @@ -113,16 +129,7 @@ function processScenario(params, callback) { fs.writeFile(resultPath, output); console.log(' Wrote ' + resultPath); - if (params.requests.length) { - processScenario(params, callback); - } else { - var elapsedTime = Date.now() - params.start; - console.log(' Done. (elapsed time: ' + elapsedTime + 'msec)'); - if (callback) - callback(null); - else - process.exit(0); - } + processNext(); }); } Modified: test/fixture/response/configuration/CreateDomain.json (+4 -0) =================================================================== --- test/fixture/response/configuration/CreateDomain.json 2012-11-09 15:54:17 +0900 (c1d319d) +++ test/fixture/response/configuration/CreateDomain.json 2012-11-09 15:59:13 +0900 (63b2432) @@ -1,4 +1,8 @@ [ + { "name" : "setup: delete all domains", + "onlyGCS" : true, + "params": { "Action": "GCSDeleteAllDomains" } }, + { "name" : "with valid name", "params": { "Action": "CreateDomain", "DomainName": "companies" } }, Modified: test/fixture/response/configuration/DeleteDomain.json (+5 -1) =================================================================== --- test/fixture/response/configuration/DeleteDomain.json 2012-11-09 15:54:17 +0900 (11abe6f) +++ test/fixture/response/configuration/DeleteDomain.json 2012-11-09 15:59:13 +0900 (f308f01) @@ -1,7 +1,11 @@ [ - { "name" : "setup to-be-deleted domain", + { "name" : "setup: delete all domains", + "onlyGCS" : true, + "params": { "Action": "GCSDeleteAllDomains" } }, + { "name" : "setup: to-be-deleted domain", "params": { "Action": "CreateDomain", "DomainName": "companies" } }, + { "name" : "with valid name", "params": { "Action": "DeleteDomain", "DomainName": "companies" } }, -------------- next part -------------- HTML����������������������������...Download