Fix child process (#501)

* Revert "remove pstree from dependencies" This reverts commit 885e87b. Signed-off-by: NivedhaSenthil <nivedhasenthil@gmail.com> * Revert "remove importing pstree" This reverts commit d305478. Signed-off-by: NivedhaSenthil <nivedhasenthil@gmail.com> * Revert "Clean up iterating to kill child processes" This reverts commit 9b5cb64. Signed-off-by: NivedhaSenthil <nivedhasenthil@gmail.com> * Revert "kill all child process properly" This reverts commit ebcff00. Signed-off-by: NivedhaSenthil <nivedhasenthil@gmail.com> * bump up version to 0.0.17 Signed-off-by: NivedhaSenthil <nivedhasenthil@gmail.com> * increase timeout for tests Signed-off-by: NivedhaSenthil <nivedhasenthil@gmail.com>
getgauge · Nov 2, 2020 · db6199e · db6199e
1 parent 1a251d7
commit db6199e
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   "description": "Gauge support for VScode.",
   "author": "ThoughtWorks",
   "license": "MIT",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "publisher": "getgauge",
   "engines": {
     "vscode": "^1.38.0"
@@ -300,6 +300,7 @@
     "clipboardy": "^2.3.0",
     "fs-extra": "^9.0.1",
     "get-port": "^4.2.0",
+    "ps-tree": "^1.2.0",
     "vscode-jsonrpc": "^5.0.1",
     "vscode-languageclient": "^6.1.3",
     "vscode-languageserver-protocol": "^3.13.0",

diff --git a/src/execution/gaugeExecutor.ts b/src/execution/gaugeExecutor.ts
@@ -13,6 +13,7 @@ import { OutputChannel } from './outputChannel';
 import { ExecutionConfig } from './executionConfig';
 import { CLI } from '../cli';
 import { join, relative, extname } from 'path';
+import psTree = require('ps-tree');
 import {
     LineTextProcessor, DebuggerAttachedEventProcessor, DebuggerNotAttachedEventProcessor, ReportEventProcessor
 } from './lineProcessors';
@@ -64,7 +65,7 @@ export class GaugeExecutor extends Disposable {
                     const relPath = relative(config.getProject().root(), config.getStatus());
                     this.preExecute.forEach((f) => { f.call(null, env, relPath); });
                     this.aborted = false;
-                    this.childProcess = spawn(cmd, args, { cwd: config.getProject().root(), env: env, detached: true });
+                    this.childProcess = spawn(cmd, args, { cwd: config.getProject().root(), env: env });
                     this.childProcess.stdout.on('data', this.filterStdoutDataDumpsToTextLines((lineText: string) => {
                         chan.appendOutBuf(lineText);
                         lineText.split("\n").forEach((lineText) => {
@@ -98,8 +99,19 @@ export class GaugeExecutor extends Disposable {
     }
     private killRecursive(pid: number, aborted: boolean) {
         try {
+            psTree(pid, (error: Error, children: Array<any>) => {
+                if (!error && children.length) {
+                    children.forEach((c: any) => {
+                        try {
+                            process.kill(c.PID);
+                        } catch (e) {
+                            if (e.code !== 'ESRCH') throw error;
+                        }
+                    });
+                }
+            });
             this.aborted = aborted;
-            return process.kill(-pid);
+            return process.kill(pid);
         } catch (error) {
             if (error.code !== 'ESRCH') throw error;
         }

diff --git a/test/execution/execution.test.ts b/test/execution/execution.test.ts
@@ -64,7 +64,7 @@ suite('Gauge Execution Tests', () => {
         setTimeout(() => commands.executeCommand(GaugeVSCodeCommands.StopExecution), 100);
         let status = await commands.executeCommand(GaugeVSCodeCommands.Execute, spec);
         assertStatus(status, false);
-    }).timeout(20000);;
+    });
 
     test('should reject execution when another is already in progress', async () => {
         let spec = path.join(testDataPath, 'specs', 'example.spec');