spawn tests should be developed

Author: potapovDim

lib/execProc.js

@@ -17,14 +17,18 @@ function buildExecRunner(failedByAssert, runOpts) {
     let additionalOpts = null
     let originalCmd = cmd
     let specificCallBack = null
-    let killTooLongExecution = null
     let executionStack = ''
 
     /**
      * @now this variable will be used for process kill if time more than @longestProcessTime
      */
     const now = +Date.now()
 
+    const killTooLongExecution = (proc) => {
+      if(Date.now() - now >= longestProcessTime) {
+        proc.kill()
+      }
+    }
     /**
      * @param {undefined|function} addSpecificOptions if function cmd will go to this function as argument
      */

lib/spawnProc.js

@@ -1,53 +1,51 @@
-const {spawn} = require('child_process')
+const {exec} = require('child_process')
 const {returnStringType} = require('./helpers')
 
-function getRunProcess(cmd) {
-  const {command, args = [], runOpts = {}} = cmd
-  return spawn(command, args, runOpts)
-}
-
-function buildSpawnRunner(failedByAssert, runOpts) {
+function buildExecRunner(failedByAssert, runOpts) {
 
   const {
     addSpecificOptionsBeforeRun,
-    currentExecutionVariable,
     longestProcessTime,
     debugProcess,
     reformatCommand,
     stackAnalize
   } = runOpts
 
-  const executeCommandAsync = (cmd) => new Promise((resolve) => {
-    const now = +Date.now()
 
+  const executeCommandAsync = (cmd) => new Promise((resolve) => {
     let watcher = null
     let additionalOpts = null
     let originalCmd = cmd
     let specificCallBack = null
-    let killTooLongExecution = null
     let executionStack = ''
 
     /**
      * @now this variable will be used for process kill if time more than @longestProcessTime
      */
+    const now = +Date.now()
 
+    const killTooLongExecution = (proc) => {
+      if(Date.now() - now >= longestProcessTime) {
+        proc.kill()
+      }
+    }
     /**
      * @param {undefined|function} addSpecificOptions if function cmd will go to this function as argument
      */
-
     if(addSpecificOptionsBeforeRun) {
+
       const cmdObj = addSpecificOptionsBeforeRun(cmd)
       cmd = cmdObj.cmd
 
       specificCallBack = cmdObj.cmdExecutableCB
+      additionalOpts = cmd.replace(originalCmd, '')
     }
 
     if(debugProcess) {console.log(cmd)}
 
-    const proc = getRunProcess(cmd)
-
+    const proc = spawn(cmd.command, cmd.args, cmd.options)
 
-    watcher = setInterval(() => executionWatcher(debugProcess, now, longestProcessTime, watcher, proc, resolve, cmd), 5000)
+    watcher = setInterval(killTooLongExecution, 5000)
 
     proc.on('exit', () => {clearInterval(watcher)})
 
@@ -100,5 +98,5 @@ function buildSpawnRunner(failedByAssert, runOpts) {
 }
 
 module.exports = {
-  buildSpawnRunner
+  buildExecRunner
 }

unit_specs/commandExecutorBuilder.spec.js …pecs/exec/commandExecutorBuilder.spec.jsunit_specs/commandExecutorBuilder.spec.js renamed to unit_specs/exec/commandExecutorBuilder.spec.js unit_specs/commandExecutorBuilder.spec.js renamed to unit_specs/exec/commandExecutorBuilder.spec.js

@@ -1,6 +1,6 @@
 const {expect} = require('chai')
 
-const {buildCommandExecutor} = require('../lib/commandExecutorBuilder')
+const {buildCommandExecutor} = require('../../lib/commandExecutorBuilder')
 
 describe('buildCommandExecutor', () => {
 

unit_specs/helper.spec.js unit_specs/exec/helper.spec.jsunit_specs/helper.spec.js renamed to unit_specs/exec/helper.spec.js

@@ -1,4 +1,4 @@
-const {getPollTime, getFormedRunCommand} = require('../lib/helpers')
+const {getPollTime, getFormedRunCommand} = require('../../lib/helpers')
 const {expect} = require('chai')
 const path = require('path')
 

unit_specs/index.spec.js unit_specs/exec/index.spec.jsunit_specs/index.spec.js renamed to unit_specs/exec/index.spec.js

@@ -1,5 +1,5 @@
 const {expect} = require('chai')
-const {buildExeRun} = require('../lib')
+const {buildExeRun} = require('../../lib')
 
 describe('kernel', () => {
   it('buildExeRun basic execution', async () => {