add safe wrapper around stop

Author: Hweinstock

packages/core/src/shared/utilities/processUtils.ts

@@ -85,12 +85,10 @@ export class ChildProcessTracker {
     }
 
     private cleanUp() {
-        console.log('in clean up')
         const terminatedProcesses = Array.from(this.#pids.values()).filter(
             (pid: number) => this.#processByPid.get(pid)?.stopped
         )
         for (const pid of terminatedProcesses) {
-            console.log('removing %s', pid)
             this.delete(pid)
         }
     }
@@ -173,6 +171,7 @@ export class ChildProcessTracker {
  */
 export class ChildProcess {
     static #runningProcesses = new ChildProcessTracker()
+    static stopTimeout = 3000
     #childProcess: proc.ChildProcess | undefined
     #processErrors: Error[] = []
     #processResult: ChildProcessResult | undefined
@@ -389,7 +388,7 @@ export class ChildProcess {
             child.kill(signal)
 
             if (force === true) {
-                waitUntil(async () => this.stopped, { timeout: 3000, interval: 200, truthy: true })
+                waitUntil(async () => this.stopped, { timeout: ChildProcess.stopTimeout, interval: 200, truthy: true })
                     .then((stopped) => {
                         if (!stopped) {
                             child.kill('SIGKILL')

packages/core/src/test/shared/utilities/processUtils.test.ts

@@ -360,6 +360,11 @@ function getSleepCmd() {
     return isWin() ? 'timeout' : 'sleep'
 }
 
+async function stopAndWait(cp: ChildProcess) {
+    cp.stop(true)
+    await waitUntil(async () => cp.stopped, { timeout: ChildProcess.stopTimeout * 2, interval: 100, truthy: true })
+}
+
 describe('ChildProcessTracker', function () {
     let tracker: ChildProcessTracker
     let clock: FakeTimers.InstalledClock
@@ -389,7 +394,7 @@ describe('ChildProcessTracker', function () {
 
         await clock.tickAsync(ChildProcessTracker.pollingInterval)
         assert.strictEqual(tracker.has(childProcess), true, 'process was mistakenly removed')
-        childProcess.stop(true)
+        await stopAndWait(childProcess)
 
         await clock.tickAsync(ChildProcessTracker.pollingInterval)
         assert.strictEqual(tracker.has(childProcess), false, 'process was not removed after stopping')
@@ -406,8 +411,7 @@ describe('ChildProcessTracker', function () {
             assert.strictEqual(tracker.has(childProcess1), true, 'Missing first process')
             assert.strictEqual(tracker.has(childProcess2), true, 'Missing second process')
 
-            childProcess1.stop()
-            console.log('child process 1 stopped')
+            await stopAndWait(childProcess1)
             await clock.tickAsync(ChildProcessTracker.pollingInterval)
             assert.strictEqual(tracker.has(childProcess2), true, 'second process was mistakenly removed')
             assert.strictEqual(tracker.has(childProcess1), false, 'first process was not removed after stopping it')