Bug 1486112 [wpt PR 12681] - Update getopts, a=testonly
authorServo WPT Sync <32481905+servo-wpt-sync@users.noreply.github.com>
Wed, 29 Aug 2018 22:42:11 +0000
changeset 482564 7a0b60f40e79d8dc37c8e9f835c825d0f1dc50da
parent 482563 31ecc34c6d02f4527efaf66d3fb954c8e39008bb
child 482565 6970b1f8cc2dcd66e0d3bf5ff4109de8082b72db
push id232
push userfmarier@mozilla.com
push dateWed, 05 Sep 2018 20:45:54 +0000
reviewerstestonly
bugs1486112, 12681
milestone63.0a1
Bug 1486112 [wpt PR 12681] - Update getopts, a=testonly Automatic update from web-platform-testsMerge pull request #12681 from web-platform-tests/sync_91f298a913836e46d27482e189ce25475298196c Merge pull request #12681 from sync_91f298a913836e46d27482e189ce25475298196c -- wpt-commits: 5895ad2564d13b7d7fd7296c3f7dd749a35879bd wpt-pr: 12681
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/servodriver.py
testing/web-platform/tests/tools/wptrunner/wptrunner/webdriver_server.py
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -645973,17 +645973,17 @@
    "39390e618fdc599e443e17b76470e989d93864e7",
    "support"
   ],
   "tools/wptrunner/wptrunner/browsers/servo.py": [
    "1a357a3ced93edf8f65b21dde8f04b08849a4669",
    "support"
   ],
   "tools/wptrunner/wptrunner/browsers/servodriver.py": [
-   "6486a788b8c8fbf4fc52dd4368265571975cabb4",
+   "d788effc469bc2f582ba7ead65700e7a13c37c59",
    "support"
   ],
   "tools/wptrunner/wptrunner/browsers/webkit.py": [
    "9482f2f774332476150d3e1bbb452d5545e2ef69",
    "support"
   ],
   "tools/wptrunner/wptrunner/config.py": [
    "5bd3f467f3eda5f564ca5c51540f23b2521a2a58",
@@ -646221,17 +646221,17 @@
    "69c3f88ec6851760081474f0f08126f3a1942660",
    "support"
   ],
   "tools/wptrunner/wptrunner/vcs.py": [
    "1de951938cf57692edca2e019bdfdc6260b8fe62",
    "support"
   ],
   "tools/wptrunner/wptrunner/webdriver_server.py": [
-   "9ecd009a7d8127ed793d4ef0aff19f6161bbd1ec",
+   "4ec415ce78bb89a82d5f098b1c4e8560e7ec39e4",
    "support"
   ],
   "tools/wptrunner/wptrunner/wptcommandline.py": [
    "81561f159a319e4a5cbe9b1d51868909649a1643",
    "support"
   ],
   "tools/wptrunner/wptrunner/wptlogging.py": [
    "ac311816c18b7f898e4421410f97d9357d2edd2d",
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/servodriver.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/servodriver.py
@@ -101,17 +101,17 @@ class ServoWebDriverBrowser(Browser):
             for port in ports
             if port
         )
 
         debug_args, command = browser_command(
             self.binary,
             self.binary_args + [
                 "--hard-fail",
-                "--webdriver", str(self.webdriver_port),
+                "--webdriver=%s" % self.webdriver_port,
                 "about:blank",
             ],
             self.debug_info
         )
 
         for stylesheet in self.user_stylesheets:
             command += ["--user-stylesheet", stylesheet]
 
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/webdriver_server.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/webdriver_server.py
@@ -192,17 +192,17 @@ class ServoDriverServer(WebDriverServer)
                  port=None, args=None):
         env = os.environ.copy()
         env["RUST_BACKTRACE"] = "1"
         WebDriverServer.__init__(self, logger, binary, host=host, port=port, env=env, args=args)
         self.binary_args = binary_args
 
     def make_command(self):
         command = [self.binary,
-                   "--webdriver", str(self.port),
+                   "--webdriver=%s" % self.port,
                    "--hard-fail",
                    "--headless"] + self._args
         if self.binary_args:
             command += self.binary_args
         return command
 
 
 class WebKitDriverServer(WebDriverServer):