fix up

Signed-off-by: SamYuan1990 <yy19902439@126.com>
SamYuan1990 · Nov 2, 2020 · 05cbdf3 · 05cbdf3
1 parent 341ada4
commit 05cbdf3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/lib/libs.js b/lib/libs.js
@@ -185,14 +185,13 @@ exports.teardown = function teardown(CmdInfo,TurnInfo){
 }
 
 exports.tapeTPS = function tapeTPS(CmdInfo,TurnInfo){
-    var command = PrepareTape(CmdInfo,TurnInfo);
+    var command = this.PrepareTape(CmdInfo,TurnInfo);
     // so far for testing
-    if (command.command=='echo'){
+    if (command.DryRun){
+      console.log(command);
       return 0
     }
-    rs = process.spawnSync(command.command,[
-      command.args
-    ]);
+    rs = process.spawnSync(command.command,command.args);
     if (rs.status !=0) {
       return handleStatus(rs);
     } 
@@ -201,8 +200,8 @@ exports.tapeTPS = function tapeTPS(CmdInfo,TurnInfo){
 
 exports.PrepareTape = function PrepareTape(CmdInfo,TurnInfo){
   var command = {};
-  if (CmdInfo.TapeCLI=='echo'){
-    return command.command = 'echo'
+  if (CmdInfo.DryRun){
+    command.DryRun = true
   }
   command.command = 'docker';
   command.args = ['run',

diff --git a/routes/api.js b/routes/api.js
@@ -41,8 +41,8 @@ router.get('/run', function(req, res, next) {
       ShutDownCLI: req.query.ShutDownCLI,
       tapeCount: parseFloat(req.query.TapeCount),
   }
-  if (req.query.TapeCLI) {
-    CmdInfo.TapeCLI = req.query.TapeCLI;
+  if (req.query.DryRun) {
+    CmdInfo.DryRun = req.query.DryRun;
   }
   BatchTimeout = [];
   BatchTimeoutArray = req.query.BatchTimeout.toString().split(",");

diff --git a/test/app.test.js b/test/app.test.js
@@ -14,7 +14,7 @@ describe('# test app.js', function () {
     });
     it('GET /api/run', function (done) {
         request
-            .get(`/api/run?BatchTimeout=1&MaxMessageCount=1&AbsoluteMaxBytes=1&PreferredMaxBytes=1&CoolDown=1&PrepareCLI=echo&StartCLI=echo&TapeCLI=echo&TapeCount=5000&ShutDownCLI=echo`)
+            .get(`/api/run?BatchTimeout=1&MaxMessageCount=1&AbsoluteMaxBytes=1&PreferredMaxBytes=1&CoolDown=1&PrepareCLI=echo&StartCLI=echo&DryRun=true&TapeCount=5000&ShutDownCLI=echo`)
             .expect(200, done)
     });
     it('GET /api/getBatchTimeout', function (done) {

diff --git a/test/lib.test.js b/test/lib.test.js
@@ -8,7 +8,7 @@ describe('# libs', function () {
             CoolDown: 1,
             PrepareCLI: 'echo',
             StartCLI: 'echo',
-            TapeCLI: 'echo',
+            DryRun: true,
             ShutDownCLI: 'echo',
         }
         BatchTimeout = [2];