Bug 1509566 [wpt PR 14213] - Rename "safari_webdriver" to "safari", get rid of "safari", a=testonly
authormoz-wptsync-bot <wptsync@mozilla.com>
Fri, 30 Nov 2018 17:50:06 +0000
changeset 449997 e751223a98da4a80147797f0937912d62c9cb56e
parent 449996 8c8a56ec4f3eec41f2db8c434a72280305a2c351
child 449998 a517bb8630aa8c1b305a2a8bb7a5787b8be18ff4
push id35189
push userccoroiu@mozilla.com
push dateTue, 11 Dec 2018 21:33:05 +0000
treeherdermozilla-central@ac7f3beb6333 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1509566, 14213
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1509566 [wpt PR 14213] - Rename "safari_webdriver" to "safari", get rid of "safari", a=testonly Automatic update from web-platform-testsRename "safari_webdriver" to "safari", get rid of "safari" (#14213) -- wpt-commits: f13770f6053eb26328adf487c7f80431da5c4509 wpt-pr: 14213
testing/web-platform/tests/.azure-pipelines.yml
testing/web-platform/tests/infrastructure/metadata/infrastructure/assumptions/allowed-to-play.html.ini
testing/web-platform/tests/infrastructure/metadata/infrastructure/assumptions/html-elements.html.ini
testing/web-platform/tests/infrastructure/metadata/infrastructure/server/context.any.js.ini
testing/web-platform/tests/infrastructure/metadata/infrastructure/server/order-of-metas.any.js.ini
testing/web-platform/tests/infrastructure/metadata/infrastructure/server/secure-context.https.any.js.ini
testing/web-platform/tests/infrastructure/metadata/infrastructure/server/title.any.js.ini
testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini
testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/elementTiming.html.ini
testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/eventOrder.html.ini
testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiDevice.html.ini
testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/pause.html.ini
testing/web-platform/tests/tools/wpt/browser.py
testing/web-platform/tests/tools/wpt/install.py
testing/web-platform/tests/tools/wpt/run.py
testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/__init__.py
testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/safari.py
testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/safari_webdriver.py
testing/web-platform/tests/tools/wptrunner/wptrunner/tests/base.py
--- a/testing/web-platform/tests/.azure-pipelines.yml
+++ b/testing/web-platform/tests/.azure-pipelines.yml
@@ -44,17 +44,17 @@ jobs:
   - template: tools/ci/azure/install_firefox.yml
   - template: tools/ci/azure/install_safari.yml
   - template: tools/ci/azure/update_hosts.yml
   - template: tools/ci/azure/update_manifest.yml
   - script: no_proxy='*' ./wpt run --yes --no-manifest-update --manifest MANIFEST.json --metadata infrastructure/metadata/ --channel=dev chrome infrastructure/
     displayName: 'Run tests (Chrome Dev)'
   - script: no_proxy='*' ./wpt run --yes --no-manifest-update --manifest MANIFEST.json --metadata infrastructure/metadata/ --channel=nightly firefox infrastructure/
     displayName: 'Run tests (Firefox Nightly)'
-  - script: no_proxy='*' ./wpt run --yes --no-manifest-update --manifest MANIFEST.json --metadata infrastructure/metadata/ --channel=preview safari_webdriver infrastructure/
+  - script: no_proxy='*' ./wpt run --yes --no-manifest-update --manifest MANIFEST.json --metadata infrastructure/metadata/ --channel=preview safari infrastructure/
     displayName: 'Run tests (Safari Technology Preview)'
 
 - job: tools_unittest_macOS
   displayName: 'tools/ unittests (macOS)'
   dependsOn: root
   condition: dependencies.root.outputs['test_jobs.tools_unittest']
   pool:
     vmImage: 'macOS-10.13'
--- a/testing/web-platform/tests/infrastructure/metadata/infrastructure/assumptions/allowed-to-play.html.ini
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/assumptions/allowed-to-play.html.ini
@@ -1,8 +1,8 @@
 [allowed-to-play.html]
   expected:
-    if product == "safari" or product == "safari_webdriver": ERROR # https://bugs.webkit.org/show_bug.cgi?id=190775
+    if product == "safari": ERROR # https://bugs.webkit.org/show_bug.cgi?id=190775
 
 
   [<audio> autoplay]
     expected:
-      if product == "safari" or product == "safari_webdriver": FAIL # https://bugs.webkit.org/show_bug.cgi?id=190775
+      if product == "safari": FAIL # https://bugs.webkit.org/show_bug.cgi?id=190775
--- a/testing/web-platform/tests/infrastructure/metadata/infrastructure/assumptions/html-elements.html.ini
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/assumptions/html-elements.html.ini
@@ -1,9 +1,9 @@
 [html-elements.html]
   [Compare CSS span definitions (only valid if pre-reqs pass)]
     expected:
-      if product == "safari" or product == "safari_webdriver": FAIL # https://webkit.org/show_bug.cgi?id=187052
+      if product == "safari": FAIL # https://webkit.org/show_bug.cgi?id=187052
 
 
   [Compare CSS div definitions (only valid if pre-reqs pass)]
     expected:
-      if product == "safari" or product == "safari_webdriver": FAIL # https://webkit.org/show_bug.cgi?id=187052
+      if product == "safari": FAIL # https://webkit.org/show_bug.cgi?id=187052
--- a/testing/web-platform/tests/infrastructure/metadata/infrastructure/server/context.any.js.ini
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/server/context.any.js.ini
@@ -1,4 +1,4 @@
 [context.any.sharedworker.html]
   [context]
     expected:
-      if product == "safari" or product == "safari_webdriver": FAIL # https://bugs.webkit.org/show_bug.cgi?id=149850
+      if product == "safari": FAIL # https://bugs.webkit.org/show_bug.cgi?id=149850
--- a/testing/web-platform/tests/infrastructure/metadata/infrastructure/server/order-of-metas.any.js.ini
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/server/order-of-metas.any.js.ini
@@ -1,4 +1,4 @@
 [order-of-metas.any.sharedworker.html]
   [foo]
     expected:
-      if product == "safari" or product == "safari_webdriver": FAIL # https://bugs.webkit.org/show_bug.cgi?id=149850
+      if product == "safari": FAIL # https://bugs.webkit.org/show_bug.cgi?id=149850
--- a/testing/web-platform/tests/infrastructure/metadata/infrastructure/server/secure-context.https.any.js.ini
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/server/secure-context.https.any.js.ini
@@ -1,4 +1,4 @@
 [secure-context.https.any.sharedworker.html]
   [secure-context]
     expected:
-      if product == "safari" or product == "safari_webdriver": FAIL # https://bugs.webkit.org/show_bug.cgi?id=149850
+      if product == "safari": FAIL # https://bugs.webkit.org/show_bug.cgi?id=149850
--- a/testing/web-platform/tests/infrastructure/metadata/infrastructure/server/title.any.js.ini
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/server/title.any.js.ini
@@ -1,4 +1,4 @@
 [title.any.sharedworker.html]
   [foobar]
     expected:
-      if product == "safari" or product == "safari_webdriver": FAIL # https://bugs.webkit.org/show_bug.cgi?id=149850
+      if product == "safari": FAIL # https://bugs.webkit.org/show_bug.cgi?id=149850
--- a/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini
@@ -1,3 +1,3 @@
 [elementPosition.html]
   expected:
-    if product == "chrome" or product == "safari" or product == "safari_webdriver": ERROR
+    if product == "chrome" or product == "safari": ERROR
--- a/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/elementTiming.html.ini
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/elementTiming.html.ini
@@ -1,3 +1,3 @@
 [elementTiming.html]
   expected:
-    if product == "chrome" or product == "safari" or product == "safari_webdriver": ERROR
+    if product == "chrome" or product == "safari": ERROR
--- a/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/eventOrder.html.ini
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/eventOrder.html.ini
@@ -1,3 +1,3 @@
 [eventOrder.html]
   expected:
-    if product == "chrome" or product == "safari" or product == "safari_webdriver": ERROR
+    if product == "chrome" or product == "safari": ERROR
--- a/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiDevice.html.ini
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiDevice.html.ini
@@ -1,3 +1,3 @@
 [multiDevice.html]
   expected:
-    if product == "chrome" or product == "safari" or product == "safari_webdriver": ERROR
+    if product == "chrome" or product == "safari": ERROR
--- a/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/pause.html.ini
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/pause.html.ini
@@ -1,3 +1,3 @@
 [pause.html]
   expected:
-    if product == "chrome" or product == "safari" or product == "safari_webdriver": ERROR
+    if product == "chrome" or product == "safari": ERROR
--- a/testing/web-platform/tests/tools/wpt/browser.py
+++ b/testing/web-platform/tests/tools/wpt/browser.py
@@ -644,20 +644,16 @@ class Safari(Browser):
             return None
         m = re.match(r"Included with Safari (.*)", version_string)
         if not m:
             logger.warn("Failed to extract version from: s%", version_string)
             return None
         return m.group(1)
 
 
-class SafariWebDriver(Safari):
-    product = "safari_webdriver"
-
-
 class Servo(Browser):
     """Servo-specific interface."""
 
     product = "servo"
     requirements = "requirements_servo.txt"
 
     def platform_components(self):
         platform = {
--- a/testing/web-platform/tests/tools/wpt/install.py
+++ b/testing/web-platform/tests/tools/wpt/install.py
@@ -2,17 +2,16 @@ import argparse
 import browser
 import sys
 
 
 latest_channels = {
     'firefox': 'nightly',
     'chrome': 'dev',
     'safari': 'preview',
-    'safari_webdriver': 'preview',
     'servo': 'nightly'
 }
 
 channel_by_name = {
     'stable': 'stable',
     'release': 'stable',
     'beta': 'beta',
     'nightly': latest_channels,
--- a/testing/web-platform/tests/tools/wpt/run.py
+++ b/testing/web-platform/tests/tools/wpt/run.py
@@ -386,21 +386,16 @@ class Safari(BrowserSetup):
             webdriver_binary = self.browser.find_webdriver(channel=kwargs["browser_channel"])
 
             if webdriver_binary is None:
                 raise WptrunError("Unable to locate safaridriver binary")
 
             kwargs["webdriver_binary"] = webdriver_binary
 
 
-class SafariWebDriver(Safari):
-    name = "safari_webdriver"
-    browser_cls = browser.SafariWebDriver
-
-
 class Sauce(BrowserSetup):
     name = "sauce"
     browser_cls = browser.Sauce
 
     def install(self, venv, channel=None):
         raise NotImplementedError
 
     def setup_kwargs(self, kwargs):
@@ -446,17 +441,16 @@ product_setup = {
     "fennec": Fennec,
     "firefox": Firefox,
     "chrome": Chrome,
     "chrome_android": ChromeAndroid,
     "edge": Edge,
     "edge_webdriver": EdgeWebDriver,
     "ie": InternetExplorer,
     "safari": Safari,
-    "safari_webdriver": SafariWebDriver,
     "servo": Servo,
     "servodriver": ServoWebDriver,
     "sauce": Sauce,
     "opera": Opera,
     "webkit": WebKit,
 }
 
 
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/__init__.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/__init__.py
@@ -25,14 +25,13 @@ module global scope.
 product_list = ["chrome",
                 "chrome_android",
                 "edge",
                 "edge_webdriver",
                 "fennec",
                 "firefox",
                 "ie",
                 "safari",
-                "safari_webdriver",
                 "sauce",
                 "servo",
                 "servodriver",
                 "opera",
                 "webkit"]
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/safari.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/safari.py
@@ -1,21 +1,21 @@
 from .base import Browser, ExecutorBrowser, require_arg
 from ..webdriver_server import SafariDriverServer
 from ..executors import executor_kwargs as base_executor_kwargs
-from ..executors.executorselenium import (SeleniumTestharnessExecutor,  # noqa: F401
-                                          SeleniumRefTestExecutor)  # noqa: F401
+from ..executors.executorwebdriver import (WebDriverTestharnessExecutor,  # noqa: F401
+                                           WebDriverRefTestExecutor)  # noqa: F401
 from ..executors.executorsafari import SafariDriverWdspecExecutor  # noqa: F401
 
 
 __wptrunner__ = {"product": "safari",
                  "check_args": "check_args",
                  "browser": "SafariBrowser",
-                 "executor": {"testharness": "SeleniumTestharnessExecutor",
-                              "reftest": "SeleniumRefTestExecutor",
+                 "executor": {"testharness": "WebDriverTestharnessExecutor",
+                              "reftest": "WebDriverRefTestExecutor",
                               "wdspec": "SafariDriverWdspecExecutor"},
                  "browser_kwargs": "browser_kwargs",
                  "executor_kwargs": "executor_kwargs",
                  "env_extras": "env_extras",
                  "env_options": "env_options"}
 
 
 def check_args(**kwargs):
deleted file mode 100644
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/safari_webdriver.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from .base import inherit
-from . import safari
-
-from ..executors.executorwebdriver import (WebDriverTestharnessExecutor,  # noqa: F401
-                                           WebDriverRefTestExecutor)  # noqa: F401
-
-
-inherit(safari, globals(), "safari_webdriver")
-
-# __wptrunner__ magically appears from inherit, F821 is undefined name
-__wptrunner__["executor"]["testharness"] = "WebDriverTestharnessExecutor"  # noqa: F821
-__wptrunner__["executor"]["reftest"] = "WebDriverRefTestExecutor"  # noqa: F821
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/tests/base.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/tests/base.py
@@ -14,17 +14,16 @@ from wptrunner import browsers
 _active_products = set()
 
 if "CURRENT_TOX_ENV" in os.environ:
     current_tox_env_split = os.environ["CURRENT_TOX_ENV"].split("-")
 
     tox_env_extra_browsers = {
         "chrome": {"chrome_android"},
         "edge": {"edge_webdriver"},
-        "safari": {"safari_webdriver"},
         "servo": {"servodriver"},
     }
 
     _active_products = set(_products) & set(current_tox_env_split)
     for product in frozenset(_active_products):
         _active_products |= tox_env_extra_browsers.get(product, set())
 else:
     _active_products = set(_products)