Merge branch 'master' of github.com:WPO-Foundation/wptagent

Author: pmeenan

Dockerfile

@@ -44,6 +44,7 @@ RUN apt-get update && \
   google-chrome-unstable \
   firefox \
   firefox-trunk \
+  firefox-geckodriver \
   opera-stable \
   opera-beta \
   opera-developer \
@@ -69,6 +70,7 @@ RUN apt-get update && \
     brotli \
     'fonttools>=3.44.0,<4.0.0' \
     marionette_driver \
+    selenium \
     future
 
 COPY wptagent.py /wptagent/wptagent.py

internal/adb.py

@@ -11,7 +11,7 @@
 import sys
 from threading import Timer
 import time
-if (sys.version_info > (3, 0)):
+if (sys.version_info >= (3, 0)):
     from time import monotonic
 else:
     from monotonic import monotonic
@@ -140,7 +140,7 @@ def start(self):
             self.simplert_path = None
             if self.options.simplert is not None and platform.system() == 'Linux':
                 running = False
-                if (sys.version_info > (3, 0)):
+                if (sys.version_info >= (3, 0)):
                     stdout = subprocess.check_output(['ps', 'ax'], encoding='UTF-8')
                 else:
                     stdout = subprocess.check_output(['ps', 'ax'])

internal/android_browser.py

@@ -11,7 +11,7 @@
 import subprocess
 import sys
 import time
-if (sys.version_info > (3, 0)):
+if (sys.version_info >= (3, 0)):
     from time import monotonic
     GZIP_TEXT = 'wt'
 else:

internal/blackbox_android.py

@@ -8,7 +8,7 @@
 import re
 import sys
 import time
-if (sys.version_info > (3, 0)):
+if (sys.version_info >= (3, 0)):
     from time import monotonic
 else:
     from monotonic import monotonic

internal/browsers.py

@@ -80,8 +80,12 @@ def get_browser(self, name, job):
         elif name in self.browsers and 'exe' in self.browsers[name]:
             job['browser_info'] = self.browsers[name]
             if 'type' in self.browsers[name] and self.browsers[name]['type'] == 'Firefox':
-                from .firefox import Firefox
-                browser = Firefox(self.browsers[name]['exe'], self.options, job)
+                if self.options.webdriver:
+                    from .firefox_webdriver import FirefoxWebDriver
+                    browser = FirefoxWebDriver(self.browsers[name]['exe'], self.options, job)
+                else:
+                    from .firefox import Firefox
+                    browser = Firefox(self.browsers[name]['exe'], self.options, job)
             elif 'type' in self.browsers[name] and self.browsers[name]['type'] == 'Edge':
                 from .microsoft_edge import Edge
                 browser = Edge(self.browsers[name]['exe'], self.options, job)

internal/chrome_android.py

@@ -10,7 +10,7 @@
 import shutil
 import sys
 import time
-if (sys.version_info > (3, 0)):
+if (sys.version_info >= (3, 0)):
     from time import monotonic
 else:
     from monotonic import monotonic

internal/desktop_browser.py

@@ -16,7 +16,7 @@
 import sys
 import threading
 import time
-if (sys.version_info > (3, 0)):
+if (sys.version_info >= (3, 0)):
     from time import monotonic
     GZIP_TEXT = 'wt'
 else:
@@ -685,7 +685,7 @@ def process_pcap(self):
             cmd = ['python', pcap_parser, '--json', '-i', pcap_file, '-d', slices_file]
             logging.debug(cmd)
             try:
-                if (sys.version_info > (3, 0)):
+                if (sys.version_info >= (3, 0)):
                     stdout = subprocess.check_output(cmd, encoding='UTF-8')
                 else:
                     stdout = subprocess.check_output(cmd)

internal/devtools.py

@@ -13,7 +13,7 @@
 import sys
 import time
 import zipfile
-if (sys.version_info > (3, 0)):
+if (sys.version_info >= (3, 0)):
     from time import monotonic
     from urllib.parse import urlsplit # pylint: disable=import-error
     unicode = str
@@ -82,9 +82,6 @@ def prepare(self):
         self.response_bodies = {}
         self.nav_error = None
         self.nav_error_code = None
-        self.main_request = None
-        self.main_request_headers = None
-        self.response_started = False
         self.start_timestamp = None
         self.path_base = os.path.join(self.task['dir'], self.task['prefix'])
         self.support_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "support")
@@ -754,9 +751,13 @@ def wait_for_page_load(self):
                     pass
                 now = monotonic()
                 elapsed_test = now - start_time
+                if 'minimumTestSeconds' in self.task and \
+                        elapsed_test < self.task['minimumTestSeconds'] and \
+                        now < end_time:
+                    continue
                 if self.nav_error is not None:
                     done = True
-                    if self.page_loaded is None:
+                    if self.page_loaded is None or 'minimumTestSeconds' in self.task:
                         self.task['error'] = self.nav_error
                         if self.nav_error_code is not None:
                             self.task['page_data']['result'] = self.nav_error_code
@@ -768,7 +769,7 @@ def wait_for_page_load(self):
                     if self.page_loaded is None:
                         self.task['error'] = "Page Load Timeout"
                         self.task['page_data']['result'] = 99997
-                elif 'time' not in self.job or elapsed_test > self.job['time']:
+                else:
                     elapsed_activity = now - self.last_activity
                     elapsed_page_load = now - self.page_loaded if self.page_loaded else 0
                     if elapsed_page_load >= 1 and elapsed_activity >= self.task['activity_time']:

internal/devtools_browser.py

@@ -14,7 +14,7 @@
 import sys
 import threading
 import time
-if (sys.version_info > (3, 0)):
+if (sys.version_info >= (3, 0)):
     from time import monotonic
     from urllib.parse import urlsplit # pylint: disable=import-error
     unicode = str
@@ -128,8 +128,12 @@ def prepare_browser(self, task):
                                            wait=True)
 
             # DevTools-based CPU throttling for desktop and emulated mobile tests
+            # This throttling should only be applied for:
+            #   1. Normal test runs where cgroups throttling (--throttle) is disabled
+            #   2. Lighthouse test runs where a custom config path is not specified
             if not self.options.android and \
                     (task['running_lighthouse'] or not self.options.throttle) and \
+                    (not task['running_lighthouse'] or not self.job['lighthouse_config']) and \
                     'throttle_cpu' in self.job:
                 logging.debug('DevTools CPU Throttle target: %0.3fx', self.job['throttle_cpu'])
                 if self.job['throttle_cpu'] > 1:
@@ -340,7 +344,7 @@ def strip_non_text(self, data):
                     self.strip_non_text(entry)
                 elif isinstance(entry, str) or isinstance(entry, unicode):
                     try:
-                        if (sys.version_info > (3, 0)):
+                        if (sys.version_info >= (3, 0)):
                             entry.encode('utf-8').decode('utf-8')
                         else:
                             entry.decode('utf-8')
@@ -358,7 +362,7 @@ def strip_non_text(self, data):
                     self.strip_non_text(entry)
                 elif isinstance(entry, str) or isinstance(entry, unicode):
                     try:
-                        if (sys.version_info > (3, 0)):
+                        if (sys.version_info >= (3, 0)):
                             entry.encode('utf-8').decode('utf-8')
                         else:
                             entry.decode('utf-8')
@@ -498,6 +502,8 @@ def process_command(self, command):
             if 'target' in command:
                 milliseconds = int(re.search(r'\d+', str(command['target'])).group())
                 self.task['activity_time'] = max(0, min(30, float(milliseconds) / 1000.0))
+        elif command['command'] == 'setminimumstepseconds':
+            self.task['minimumTestSeconds'] = int(re.search(r'\d+', str(command['target'])).group())
         elif command['command'] == 'setuseragent':
             self.task['user_agent_string'] = command['target']
         elif command['command'] == 'setcookie':
@@ -574,7 +580,8 @@ def run_lighthouse_test(self, task):
         """Run a lighthouse test against the current browser session"""
         task['lighthouse_log'] = ''
         if 'url' in self.job and self.job['url'] is not None:
-            self.job['shaper'].configure(self.job, task)
+            if not self.job['lighthouse_config']:
+                self.job['shaper'].configure(self.job, task)
             output_path = os.path.join(task['dir'], 'lighthouse.json')
             json_file = os.path.join(task['dir'], 'lighthouse.report.json')
             json_gzip = os.path.join(task['dir'], 'lighthouse.json.gz')
@@ -584,24 +591,33 @@ def run_lighthouse_test(self, task):
             command = ['lighthouse',
                        '"{0}"'.format(self.job['url']),
                        '--channel', 'wpt',
-                       '--disable-network-throttling',
-                       '--disable-cpu-throttling',
-                       '--throttling-method', 'provided',
                        '--enable-error-reporting',
                        '--max-wait-for-load', str(int(time_limit * 1000)),
                        '--port', str(task['port']),
                        '--output', 'html',
                        '--output', 'json',
                        '--output-path', '"{0}"'.format(output_path)]
+            if self.job['lighthouse_config']:
+                try:
+                    lighthouse_config_file = os.path.join(task['dir'], 'lighthouse-config.json')
+                    with open(lighthouse_config_file, 'wt') as f_out:
+                        json.dump(json.loads(self.job['lighthouse_config']), f_out)
+                    command.extend(['--config-path', lighthouse_config_file])
+                except Exception:
+                    logging.exception('Error adding custom config for lighthouse test')
+            else:
+                command.extend(['--throttling-method', 'provided'])
             if self.job['keep_lighthouse_trace']:
                 command.append('--save-assets')
             if not self.job['keep_lighthouse_screenshots']:
                 command.extend(['--skip-audits', 'screenshot-thumbnails'])
-            if self.options.android or 'mobile' not in self.job or not self.job['mobile']:
+            if self.options.android:
                 command.extend(['--emulated-form-factor', 'none'])
                 if 'user_agent_string' in self.job:
                     sanitized_user_agent = re.sub(r'[^a-zA-Z0-9_\-.;:/()\[\] ]+', '', self.job['user_agent_string'])
                     command.append('--chrome-flags="--user-agent=\'{0}\'"'.format(sanitized_user_agent))
+            elif 'mobile' not in self.job or not self.job['mobile']:
+                command.extend(['--emulated-form-factor', 'desktop'])
             if len(task['block']):
                 for pattern in task['block']:
                     pattern = "'" + pattern.replace("'", "'\\''") + "'"