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
This commit is contained in:
moz-wptsync-bot 2018-11-30 17:50:06 +00:00
Родитель 8a9f5fd877
Коммит 06c6d59fd9
19 изменённых файлов: 18 добавлений и 43 удалений

Просмотреть файл

@ -49,7 +49,7 @@ jobs:
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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -649,10 +649,6 @@ class Safari(Browser):
return m.group(1)
class SafariWebDriver(Safari):
product = "safari_webdriver"
class Servo(Browser):
"""Servo-specific interface."""

Просмотреть файл

@ -7,7 +7,6 @@ latest_channels = {
'firefox': 'nightly',
'chrome': 'dev',
'safari': 'preview',
'safari_webdriver': 'preview',
'servo': 'nightly'
}

Просмотреть файл

@ -391,11 +391,6 @@ class Safari(BrowserSetup):
kwargs["webdriver_binary"] = webdriver_binary
class SafariWebDriver(Safari):
name = "safari_webdriver"
browser_cls = browser.SafariWebDriver
class Sauce(BrowserSetup):
name = "sauce"
browser_cls = browser.Sauce
@ -451,7 +446,6 @@ product_setup = {
"edge_webdriver": EdgeWebDriver,
"ie": InternetExplorer,
"safari": Safari,
"safari_webdriver": SafariWebDriver,
"servo": Servo,
"servodriver": ServoWebDriver,
"sauce": Sauce,

Просмотреть файл

@ -30,7 +30,6 @@ product_list = ["chrome",
"firefox",
"ie",
"safari",
"safari_webdriver",
"sauce",
"servo",
"servodriver",

Просмотреть файл

@ -1,16 +1,16 @@
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",

Просмотреть файл

@ -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

Просмотреть файл

@ -19,7 +19,6 @@ if "CURRENT_TOX_ENV" in os.environ:
tox_env_extra_browsers = {
"chrome": {"chrome_android"},
"edge": {"edge_webdriver"},
"safari": {"safari_webdriver"},
"servo": {"servodriver"},
}