This repository has been archived by the owner on Jul 18, 2018. It is now read-only.
forked from ChromiumWebApps/chromium
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Roll in new version of wpt tools and modify callers correspondingly
* Updated the versions in WPT_HEAD in checkout.sh and README.chromium. * All wpt commands now have a single entry point, wpt. Include this dispatch module in WPTWhiteList. * The commands for generating manifest, starting wptserve and running wpt lint are now "wpt manifest", "wpt serve" and "wpt lint". Change webkitpy and PRESUBMIT.py accordingly. * The new wptserve contains a change for fetch/api/abort/general-serviceworker.https.html (web-platform-tests/wpt#6484), so the test is rebaselined. Bug: 749879 Change-Id: I214860078add1c391266f063193aa279db414bb0 Reviewed-on: https://chromium-review.googlesource.com/677557 Reviewed-by: Quinten Yearsley <qyearsley@chromium.org> Commit-Queue: Robert Ma <robertma@chromium.org> Cr-Commit-Position: refs/heads/master@{#504060}
- Loading branch information
Showing
41 changed files
with
1,958 additions
and
130 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 48 additions & 1 deletion
49
.../WebKit/LayoutTests/external/wpt/fetch/api/abort/general-serviceworker.https-expected.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,51 @@ | ||
| This is a testharness.js-based test. | ||
| FAIL General fetch abort tests in a service worker Failed to register a ServiceWorker: The script does not have a MIME type. | ||
| FAIL Aborting rejects with AbortError promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Aborting rejects with AbortError - no-cors promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| PASS TypeError from request constructor takes priority - RequestInit's window is not null | ||
| FAIL TypeError from request constructor takes priority - Input URL is not valid promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL TypeError from request constructor takes priority - Input URL has credentials promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL TypeError from request constructor takes priority - RequestInit's mode is navigate promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL TypeError from request constructor takes priority - RequestInit's referrer is invalid promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL TypeError from request constructor takes priority - RequestInit's method is invalid promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL TypeError from request constructor takes priority - RequestInit's method is forbidden promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL TypeError from request constructor takes priority - RequestInit's mode is no-cors and method is not simple promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| PASS TypeError from request constructor takes priority - RequestInit's cache mode is only-if-cached and mode is not same-origin | ||
| PASS TypeError from request constructor takes priority - Request with cache mode: only-if-cached and fetch mode cors | ||
| PASS TypeError from request constructor takes priority - Request with cache mode: only-if-cached and fetch mode no-cors | ||
| FAIL TypeError from request constructor takes priority - Bad referrerPolicy init parameter value promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| PASS TypeError from request constructor takes priority - Bad mode init parameter value | ||
| PASS TypeError from request constructor takes priority - Bad credentials init parameter value | ||
| PASS TypeError from request constructor takes priority - Bad cache init parameter value | ||
| PASS TypeError from request constructor takes priority - Bad redirect init parameter value | ||
| FAIL Request objects have a signal property assert_true: Signal member is present & truthy expected true got false | ||
| FAIL Signal on request object promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Signal on request object created from request object promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Signal on request object created from request object, with signal on second request promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Signal on request object created from request object, with signal on second request overriding another promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Signal retained after unrelated properties are overridden by fetch promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Signal removed by setting to null promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Already aborted signal rejects immediately promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Request is still 'used' if signal is aborted before fetching promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL response.arrayBuffer() rejects if already aborted promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL response.blob() rejects if already aborted promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL response.formData() rejects if already aborted promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL response.json() rejects if already aborted promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL response.text() rejects if already aborted promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Already aborted signal does not make request promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Already aborted signal can be used for many fetches promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Signal can be used to abort other fetches, even if another fetch succeeded before aborting promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Underlying connection is closed when aborting after receiving response promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Underlying connection is closed when aborting after receiving response - no-cors promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Fetch aborted & connection closed when aborted after calling response.arrayBuffer() promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Fetch aborted & connection closed when aborted after calling response.blob() promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Fetch aborted & connection closed when aborted after calling response.formData() promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Fetch aborted & connection closed when aborted after calling response.json() promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Fetch aborted & connection closed when aborted after calling response.text() promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Stream errors once aborted. Underlying connection closed. promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Stream errors once aborted, after reading. Underlying connection closed. promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Stream will not error if body is empty. It's closed with an empty queue before it errors. promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Readable stream synchronously cancels with AbortError if aborted before reading promise_test: Unhandled rejection with value: object "ReferenceError: AbortController is not defined" | ||
| FAIL Signal state is cloned AbortController is not defined | ||
| FAIL Clone aborts with original controller AbortController is not defined | ||
| Harness: the test ran to completion. | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/chromium.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/lint/lint.py b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/lint/lint.py | ||
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/lint/lint.py | ||
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/lint/lint.py | ||
| @@ -725,6 +725,7 @@ def create_parser(): | ||
| help="Run CSS testsuite specific lints") | ||
| parser.add_argument("--repo-root", help="The WPT directory. Use this" | ||
| "option if the lint script exists outside the repository") | ||
| + parser.add_argument("--ignore-glob", help="Additional file glob to ignore.") | ||
| parser.add_argument("--all", action="store_true", help="If no paths are passed, try to lint the whole " | ||
| "working directory, not just files that changed") | ||
| return parser | ||
| @@ -746,16 +747,21 @@ def main(**kwargs): | ||
|
|
||
| paths = lint_paths(kwargs, repo_root) | ||
|
|
||
| - return lint(repo_root, paths, output_format, kwargs.get("css_mode", False)) | ||
| + ignore_glob = kwargs.get("ignore_glob") | ||
|
|
||
| + return lint(repo_root, paths, output_format, kwargs.get("css_mode", False), ignore_glob) | ||
|
|
||
| -def lint(repo_root, paths, output_format, css_mode): | ||
| + | ||
| +def lint(repo_root, paths, output_format, css_mode, ignore_glob): | ||
| error_count = defaultdict(int) | ||
| last = None | ||
|
|
||
| with open(os.path.join(repo_root, "lint.whitelist")) as f: | ||
| whitelist, ignored_files = parse_whitelist(f) | ||
|
|
||
| + if ignore_glob: | ||
| + ignored_files.add(ignore_glob) | ||
| + | ||
| output_errors = {"json": output_errors_json, | ||
| "markdown": output_errors_markdown, | ||
| "normal": output_errors_text}[output_format] | ||
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wpt/paths b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wpt/paths | ||
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wpt/paths | ||
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wpt/paths | ||
| @@ -1,4 +1,3 @@ | ||
| -tools/ci/ | ||
| tools/lint/ | ||
| tools/manifest/ | ||
| tools/serve/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,3 +15,4 @@ webdriver/.idea | |
| .DS_Store | ||
| *.rej | ||
| _venv | ||
| webdriver/.cache | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 0 additions & 11 deletions
11
third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/lint
This file was deleted.
Oops, something went wrong.
8 changes: 0 additions & 8 deletions
8
third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/manifest
This file was deleted.
Oops, something went wrong.
3 changes: 3 additions & 0 deletions
3
third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/lint/commands.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| {"lint": | ||
| {"path": "lint.py", "script": "main", "parser": "create_parser", "help": "Run the lint", | ||
| "virtualenv": false}} |
Oops, something went wrong.