Make LaunchedChrome.kill sync (#269)

GoogleChrome · Jun 9, 2022 · 1cbf8b9 · 1cbf8b9
1 parent 0bd5a5d
commit 1cbf8b9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/chrome-launcher.ts b/src/chrome-launcher.ts
@@ -46,7 +46,7 @@ export interface LaunchedChrome {
   pid: number;
   port: number;
   process: ChildProcess;
-  kill: () => Promise<void>;
+  kill: () => void;
 }
 
 export interface ModuleOverrides {
@@ -72,12 +72,12 @@ async function launch(opts: Options = {}): Promise<LaunchedChrome> {
 
   await instance.launch();
 
-  const kill = async () => {
+  const kill = () => {
     instances.delete(instance);
     if (instances.size === 0) {
       process.removeListener(_SIGINT, sigintListener);
     }
-    return instance.kill();
+    instance.kill();
   };
 
   return {pid: instance.pid!, port: instance.port!, kill, process: instance.chromeProcess!};

diff --git a/test/chrome-launcher-test.ts b/test/chrome-launcher-test.ts
@@ -62,7 +62,7 @@ describe('Launcher', () => {
 
     chromeInstance.prepare();
 
-    await chromeInstance.destroyTmp();
+    chromeInstance.destroyTmp();
     assert.strictEqual(fs.rmdirSync.callCount, 0);
     assert.strictEqual(fs.rmSync.callCount, 0);
   });
@@ -105,7 +105,7 @@ describe('Launcher', () => {
     const chromeInstance = new Launcher({}, {fs: fs as any});
 
     chromeInstance.prepare();
-    await chromeInstance.destroyTmp();
+    chromeInstance.destroyTmp();
     assert.strictEqual(rmMock.callCount, 1);
   });
 
@@ -149,14 +149,14 @@ describe('Launcher', () => {
   it('doesn\'t fail when killed twice', async () => {
     const chromeInstance = new Launcher();
     await chromeInstance.launch();
-    await chromeInstance.kill();
-    await chromeInstance.kill();
+    chromeInstance.kill();
+    chromeInstance.kill();
   }).timeout(30 * 1000);
 
   it('doesn\'t fail when killing all instances', async () => {
     await launch();
     await launch();
-    const errors = await killAll();
+    const errors = killAll();
     assert.strictEqual(errors.length, 0);
   });
 
@@ -166,7 +166,7 @@ describe('Launcher', () => {
     let pid = chromeInstance.pid!;
     await chromeInstance.launch();
     assert.strictEqual(pid, chromeInstance.pid);
-    await chromeInstance.kill();
+    chromeInstance.kill();
   });
 
   it('gets all default flags', async () => {

diff --git a/test/launch-signature-test.ts b/test/launch-signature-test.ts
@@ -26,6 +26,6 @@ describe('Launcher', () => {
     assert.notStrictEqual(chrome.pid, undefined);
     assert.notStrictEqual(chrome.port, undefined);
     assert.notStrictEqual(chrome.kill, undefined);
-    await chrome.kill();
+    chrome.kill();
   });
 });