prevent dirty exit

FuelLabs · Jul 10, 2024 · fe648f9 · fe648f9
1 parent 3e1b704
commit fe648f9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/packages/account/src/test-utils/launchNode.test.ts b/packages/account/src/test-utils/launchNode.test.ts
@@ -207,9 +207,21 @@ describe('launchNode', () => {
     expect(mkdirSyncSpy).toHaveBeenCalledTimes(1);
     const tempDirPath = mkdirSyncSpy.mock.calls[0][0];
 
-    childProcessMod.execSync(`kill -- -${pid}`);
+    childProcessMod.execSync(`kill ${pid}`);
     // wait until cleanup finishes (done via events)
     await sleep(1500);
     expect(fsMod.existsSync(tempDirPath)).toBeFalsy();
   });
+
+  test('calling cleanup on externally killed node does not throw', async () => {
+    const mkdirSyncSpy = vi.spyOn(fsMod, 'mkdirSync');
+
+    const { pid, cleanup } = await launchNode({ loggingEnabled: false });
+    expect(mkdirSyncSpy).toHaveBeenCalledTimes(1);
+
+    childProcessMod.execSync(`kill -- -${pid}`);
+    // wait until cleanup finishes (done via events)
+    await sleep(1500);
+    cleanup();
+  });
 });
diff --git a/packages/account/src/test-utils/launchNode.ts b/packages/account/src/test-utils/launchNode.ts
@@ -234,10 +234,19 @@ export const launchNode = async ({
       }
       childState.isDead = true;
 
+      removeSideffects();
       if (child.pid !== undefined) {
-        process.kill(-child.pid);
+        try {
+          process.kill(-child.pid);
+        } catch (e) {
+          const error = e as Error & { code: string };
+          if (error.code === 'ESRCH') {
+            //
+          } else {
+            throw e;
+          }
+        }
       } else {
-        removeSideffects();
         // eslint-disable-next-line no-console
         console.error('No PID available for the child process, unable to kill launched node');
       }