Summary: | WPT server should use its own testharness.js file and generate a warning when it does not match WebKit version | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | youenn fablet <youennf> | ||||||||
Component: | Tools / Tests | Assignee: | youenn fablet <youennf> | ||||||||
Status: | RESOLVED FIXED | ||||||||||
Severity: | Normal | CC: | cdumez, commit-queue, darin, glenn, lforschler, rniwa | ||||||||
Priority: | P2 | ||||||||||
Version: | WebKit Nightly Build | ||||||||||
Hardware: | Unspecified | ||||||||||
OS: | Unspecified | ||||||||||
Bug Depends on: | 151262, 151295 | ||||||||||
Bug Blocks: | |||||||||||
Attachments: |
|
Description
youenn fablet
2015-10-19 09:10:44 PDT
Created attachment 263485 [details]
Patch
(In reply to comment #1) > Created attachment 263485 [details] > Patch Need to wait to land this patch as WebKit testharness timeouts are different from WPT default values. Comment on attachment 263485 [details] Patch Clearing flags on attachment: 263485 Committed r192462: <http://trac.webkit.org/changeset/192462> All reviewed patches have been landed. Closing bug. Re-opened since this is blocked by bug 151295 Created attachment 265574 [details]
Fixing python tests
Comment on attachment 265574 [details]
Fixing python tests
Fixing python tests.
Marking it as r? again.
Comment on attachment 265574 [details] Fixing python tests View in context: https://bugs.webkit.org/attachment.cgi?id=265574&action=review > Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:103 > + wk_testharnessjs_file = self._filesystem.join(self._layout_root, "resources", "testharness.js") Since everything is in WebKit, it's probably better to call it layout_test_testharnessjs_file instead. > Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:104 > + # Next two lines are a temp hack for this patch to land smoothly on bots. They should be removed once patch landed and each bot runs these lines once. Nit: an extra space at the beginning. Also, this should probably be a FIXME. > Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:107 > + # Let's check whether WPT testharness.js is the same as WK version I don't think this comment is necessary. Please remove it. > Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:109 > + _log.warning("\n//////////\nWPT tests are not using the same testharness.js file as other WebKit Layout tests.\nWebKit testharness.js might need to be updated according WPT testharness.js.\n//////////\n") Nit: according WPT testharness.js. Created attachment 265852 [details]
Patch for landing
Thanks for the review.
I updated according your comments...
> > Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:109
> > + _log.warning("\n//////////\nWPT tests are not using the same testharness.js file as other WebKit Layout tests.\nWebKit testharness.js might need to be updated according WPT testharness.js.\n//////////\n")
>
> Nit: according WPT testharness.js.
Except for this one. I am not sure what you are suggesting.
Let me know and I'll be able to fix that as a follow-up patch.
Comment on attachment 265852 [details] Patch for landing Clearing flags on attachment: 265852 Committed r192617: <http://trac.webkit.org/changeset/192617> All reviewed patches have been landed. Closing bug. |