test(node-runtime-worker-thread): Wait for the child process to exit before stopping the tests

Author: gribnoysup

packages/node-runtime-worker-thread/src/index.ts

@@ -1,11 +1,10 @@
 /* istanbul ignore file */
 
-import { once } from 'events';
 import { ChildProcess } from 'child_process';
 import { MongoClientOptions } from '@mongosh/service-provider-core';
 import { Runtime } from '@mongosh/browser-runtime-core';
 import { EvaluationListener } from '@mongosh/shell-evaluator';
-import spawnChildFromSource from './spawn-child-from-source';
+import spawnChildFromSource, { kill } from './spawn-child-from-source';
 import { Caller, createCaller, exposeAll, WithClose } from './rpc';
 import type { WorkerRuntime as WorkerThreadWorkerRuntime } from './worker-runtime';
 import childProcessProxySrc from 'inline-entry-loader!./child-process-proxy';
@@ -107,12 +106,7 @@ class WorkerRuntime implements Runtime {
   async terminate() {
     await this.initWorkerPromise;
     this.childProcess.kill('SIGTERM');
-    if (
-      this.childProcess.exitCode === null &&
-      this.childProcess.signalCode === null
-    ) {
-      await once(this.childProcess, 'exit');
-    }
+    await kill(this.childProcess);
   }
 }
 

packages/node-runtime-worker-thread/src/spawn-child-from-source.spec.ts

@@ -3,15 +3,15 @@ import chaiAsPromised from 'chai-as-promised';
 import childProcess from 'child_process';
 import { once } from 'events';
 
-import spawnChildFromSource from './spawn-child-from-source';
+import spawnChildFromSource, { kill } from './spawn-child-from-source';
 
 chai.use(chaiAsPromised);
 
 describe('spawnChildFromSource', () => {
   it('should resolve with a child process', async() => {
     const spawned = await spawnChildFromSource('');
     expect(spawned).to.be.instanceof((childProcess as any).ChildProcess);
-    spawned.kill('SIGTERM');
+    await kill(spawned);
   });
 
   it('should spawn a process with an ipc channel open', async() => {
@@ -21,7 +21,7 @@ describe('spawnChildFromSource', () => {
     spawned.send('Hi!');
     const [message] = await once(spawned, 'message');
     expect(message).to.equal('Hi!');
-    spawned.kill('SIGTERM');
+    await kill(spawned);
   });
 
   it('should fail if process exited before successfully starting', () => {

packages/node-runtime-worker-thread/src/spawn-child-from-source.ts

@@ -8,6 +8,17 @@ import {
   StdioNull,
   StdioPipe
 } from 'child_process';
+import { once } from 'events';
+
+export async function kill(childProcess: ChildProcess, code: NodeJS.Signals | number = 'SIGTERM') {
+  childProcess.kill(code);
+  if (
+    childProcess.exitCode === null &&
+    childProcess.signalCode === null
+  ) {
+    await once(childProcess, 'exit');
+  }
+}
 
 export default function spawnChildFromSource(
   src: string,
@@ -16,7 +27,7 @@ export default function spawnChildFromSource(
   _stdout: StdioNull | StdioPipe = 'inherit',
   _stderr: StdioNull | StdioPipe = 'inherit',
 ): Promise<ChildProcess> {
-  return new Promise((resolve, reject) => {
+  return new Promise(async(resolve, reject) => {
     const readyToken = Date.now().toString(32);
 
     const childProcess = spawn(process.execPath, {
@@ -25,6 +36,7 @@ export default function spawnChildFromSource(
     });
 
     if (!childProcess.stdin) {
+      await kill(childProcess);
       return reject(
         new Error("Can't write src to the spawned process, missing stdin")
       );
@@ -59,11 +71,11 @@ export default function spawnChildFromSource(
 
     timeoutId =
       timeoutMs !== undefined
-        ? setTimeout(() => {
+        ? setTimeout(async() => {
+          await kill(childProcess);
           reject(
             new Error('Timed out while waiting for child process to start')
           );
-          childProcess.kill('SIGTERM');
         }, timeoutMs)
         : null;
   });