Run image checks in parallel

Author: pmeenan

internal/devtools.py

@@ -1486,10 +1486,10 @@ def process_message(self, msg, target_id=None):
             if len(parts) >= 2:
                 category = parts[0]
                 event = parts[1]
-                log_event = bool(self.recording)
+                log_event = bool(self.capturing)
                 if category == 'Page' and self.recording:
                     self.process_page_event(event, msg)
-                elif category == 'Network' and self.recording:
+                elif category == 'Network':
                     self.process_network_event(event, msg, target_id)
                 elif category == 'Console' and self.recording:
                     self.process_console_event(event, msg)
@@ -1681,7 +1681,7 @@ def process_network_event(self, event, msg, target_id=None):
                 except Exception:
                     logging.exception('Error processing host override')
                 self.send_command('Network.continueInterceptedRequest', params, target_id=target_id)
-        elif 'requestId' in msg['params']:
+        elif 'requestId' in msg['params'] and self.capturing:
             timestamp = None
             if 'params' in msg and 'timestamp' in msg['params']:
                 timestamp = msg['params']['timestamp']

internal/devtools_browser.py

@@ -574,17 +574,6 @@ def collect_browser_metrics(self, task):
         """Collect all of the in-page browser metrics that we need"""
         if self.must_exit_now:
             return
-        user_timing = self.run_js_file('user_timing.js')
-        if user_timing is not None:
-            path = os.path.join(task['dir'], task['prefix'] + '_timed_events.json.gz')
-            with gzip.open(path, GZIP_TEXT, 7) as outfile:
-                outfile.write(json.dumps(user_timing))
-        page_data = self.run_js_file('page_data.js')
-        self.document_domain = None
-        if page_data is not None:
-            if 'document_hostname' in page_data:
-                self.document_domain = page_data['document_hostname']
-            task['page_data'].update(page_data)
         if 'customMetrics' in self.job:
             requests = None
             dns_info = None
@@ -671,6 +660,8 @@ def collect_browser_metrics(self, task):
 
     def finish_collect_browser_metrics(self, task):
         """ Collect the asyc custom metrics results"""
+        if self.must_exit_now:
+            return
         try:
             if self.custom_metrics_command_ids:
                 custom_metrics = {}
@@ -694,6 +685,17 @@ def finish_collect_browser_metrics(self, task):
                 with gzip.open(path, GZIP_TEXT, 7) as outfile:
                     outfile.write(json.dumps(custom_metrics))
                 self.custom_metrics_command_ids = None
+            user_timing = self.run_js_file('user_timing.js')
+            if user_timing is not None:
+                path = os.path.join(task['dir'], task['prefix'] + '_timed_events.json.gz')
+                with gzip.open(path, GZIP_TEXT, 7) as outfile:
+                    outfile.write(json.dumps(user_timing))
+            page_data = self.run_js_file('page_data.js')
+            self.document_domain = None
+            if page_data is not None:
+                if 'document_hostname' in page_data:
+                    self.document_domain = page_data['document_hostname']
+                task['page_data'].update(page_data)
         except Exception:
             logging.exception('Error collecting async custom metrics results')