🐛 Always kill browser process when able to

percy · Feb 14, 2021 · 0968fff · 0968fff
1 parent 1f8f5d9
commit 0968fff
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/packages/core/src/discovery/browser.js b/packages/core/src/discovery/browser.js
@@ -115,14 +115,11 @@ export default class Browser extends EventEmitter {
     this.#callbacks.clear();
     this.pages.clear();
 
-    // no executable means the browser never launched
-    // an exit code means the browser has already closed
-    /* istanbul ignore next: sanity */
-    if (!this.executable || this.process.exitCode) return;
-
     // attempt to close the browser gracefully
     let closed = new Promise(resolve => {
-      this.process.on('exit', resolve);
+      /* istanbul ignore next: race condition paranoia */
+      if (!this.process || this.process.exitCode) resolve();
+      else this.process.on('exit', resolve);
     });
 
     /* istanbul ignore next:
@@ -137,18 +134,21 @@ export default class Browser extends EventEmitter {
     });
 
     // attempt to clean up the profile directory after closing
-    await closed.then(() => new Promise(resolve => {
-      rimraf(this.profile, error => {
-        /* istanbul ignore next:
-         *   this might happen on some systems but ultimately it is a temp file */
-        if (error) {
-          this.log.debug('Could not clean up temporary browser profile directory.');
-          this.log.debug(error);
-        }
-
-        resolve();
-      });
-    }));
+    /* istanbul ignore else: sanity */
+    if (this.profile) {
+      await closed.then(() => new Promise(resolve => {
+        rimraf(this.profile, error => {
+          /* istanbul ignore next:
+           *   this might happen on some systems but ultimately it is a temp file */
+          if (error) {
+            this.log.debug('Could not clean up temporary browser profile directory.');
+            this.log.debug(error);
+          }
+
+          resolve();
+        });
+      }));
+    }
   }
 
   async page({ meta }) {