Update web-platform-tests to revision ade06500869396f7a46b95bc3553af4ca9c07f31

tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py

@@ -31,10 +31,12 @@ def find_wptreport(args):
     return parser.parse_known_args(args)[0].log_wptreport
 
 
-def gzip_file(filename):
+def gzip_file(filename, delete_original=True):
     with open(filename, 'rb') as f_in:
         with gzip.open('%s.gz' % filename, 'wb') as f_out:
             shutil.copyfileobj(f_in, f_out)
+    if delete_original:
+        os.unlink(filename)
 
 
 def main(product, commit_range, wpt_args):
@@ -67,9 +69,8 @@ def main(product, commit_range, wpt_args):
         logger.info("Running all tests")
 
     wpt_args += [
-        "--log-tbpl=../artifacts/log_tbpl.log",
         "--log-tbpl-level=info",
-        "--log-mach=-",
+        "--log-tbpl=-",
         "-y",
         "--no-pause",
         "--no-restart-on-unexpected",

tests/wpt/web-platform-tests/tools/wpt/browser.py

@@ -264,7 +264,7 @@ class Firefox(Browser):
 
         dest = os.path.join(dest, "profiles", channel)
         if version:
-            dest = dest.join(version)
+            dest = os.path.join(dest, version)
         have_cache = False
         if os.path.exists(dest):
             if channel != "nightly":
@@ -711,11 +711,15 @@ class Servo(Browser):
     def version(self, binary):
         """Retrieve the release version of the installed browser."""
         output = call(binary, "--version")
-        m = re.search(r"[0-9\.]+( [a-z]+)?$", output.strip())
+        m = re.search(r"Servo ([0-9\.]+-[a-f0-9]+)?(-dirty)?$", output.strip())
         if m:
             return m.group(0)
 
 
+class ServoWebDriver(Servo):
+    product = "servodriver"
+
+
 class Sauce(Browser):
     """Sauce-specific interface."""
 

tests/wpt/web-platform-tests/tools/wpt/run.py

@@ -414,6 +414,11 @@ class Servo(BrowserSetup):
             kwargs["binary"] = binary
 
 
+class ServoWebDriver(Servo):
+    name = "servodriver"
+    browser_cls = browser.ServoWebDriver
+
+
 class WebKit(BrowserSetup):
     name = "webkit"
     browser_cls = browser.WebKit
@@ -436,7 +441,7 @@ product_setup = {
     "safari": Safari,
     "safari_webdriver": SafariWebDriver,
     "servo": Servo,
-    "servodriver": Servo,
+    "servodriver": ServoWebDriver,
     "sauce": Sauce,
     "opera": Opera,
     "webkit": WebKit,
@@ -482,7 +487,7 @@ def setup_wptrunner(venv, prompt=True, install_browser=False, **kwargs):
             if channel != kwargs["channel"]:
                 logger.info("Interpreting channel '%s' as '%s'" % (kwargs["channel"],
                                                                    channel))
-                kwargs["browser_channel"] = channel
+            kwargs["browser_channel"] = channel
         else:
             logger.info("Valid channels for %s not known; using argument unmodified" % kwargs["product"])
     del kwargs["channel"]

tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py

@@ -4,7 +4,7 @@ import tempfile
 
 from mozprocess import ProcessHandler
 
-from serve.serve import make_hosts_file
+from tools.serve.serve import make_hosts_file
 
 from .base import Browser, require_arg, get_free_port, browser_command, ExecutorBrowser
 from ..executors import executor_kwargs as base_executor_kwargs