Latest review changes

GoogleChrome · Sep 22, 2016 · 41e390d · 41e390d
1 parent a58fef2
commit 41e390d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lighthouse-core/gather/drivers/driver.js b/lighthouse-core/gather/drivers/driver.js
@@ -253,7 +253,6 @@ class Driver {
 
       let swHasMoreThanOneClient = false;
       registrations
-        .filter(reg => !reg.isDeleted)
         .filter(reg => {
           const parsedURL = parseURL(reg.scopeURL);
           const swOrigin = `${parsedURL.protocol}//${parsedURL.hostname}` +

diff --git a/lighthouse-core/gather/gather-runner.js b/lighthouse-core/gather/gather-runner.js
@@ -98,6 +98,11 @@ class GatherRunner {
       });
   }
 
+  static disposeDriver(driver) {
+    log.log('status', 'Disconnecting from browser...');
+    driver.disconnect();
+  }
+
   /**
    * Navigates to about:blank and calls beforePass() on gatherers before tracing
    * has started and before navigation to the target page.
@@ -255,8 +260,7 @@ class GatherRunner {
         // We dont need to hold up the reporting for the reload/disconnect,
         // so we will not return a promise in here.
         driver.reloadForCleanStateIfNeeded(options).then(_ => {
-          log.log('status', 'Disconnecting from browser...');
-          driver.disconnect();
+          GatherRunner.disposeDriver(driver);
         });
       })
       .then(_ => {
@@ -274,6 +278,12 @@ class GatherRunner {
           });
         });
         return artifacts;
+      })
+      // cleanup on error
+      .catch(err => {
+        GatherRunner.disposeDriver(driver);
+
+        throw err;
       });
   }