Attachment 288119 Details for Bug 161626 – Patch for landing

[patch] Patch for landing

bug-161626-20160907101725.patch (text/plain), 6.03 KB, created by youenn fablet on 2016-09-07 01:19:50 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2016-09-07 01:19:50 PDT

Size: 6.03 KB

patch

obsolete

>Subversion Revision: 205535
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 44bac204919e2f3f0ba8d63a30bc00d78de24a8f..7f64ab83367a55106b72c91095388893b01d70ce 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2016-09-07  Youenn Fablet  <youenn@apple.com>
>+
>+        Using tests-options.json to compute whether tests are slow
>+        https://bugs.webkit.org/show_bug.cgi?id=161626
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitpy/layout_tests/controllers/manager_unittest.py: Updated first test to use a MockHost.
>+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
>+        (Manager.__init__): Loading tests-options.json
>+        (Manager._test_is_slow): Computing timeout value based on tests-options.json.
>+
> 2016-09-06  Youenn Fablet  <youenn@apple.com>
> 
>         [Streams API] Separate compile flag for ReadableStream and WritableStream
>diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py b/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
>index afef0818369635cd07f82e29306e3923c9ec90aa..0e5a3037c532c85163fb6066f73aa16ed7f38fbb 100644
>--- a/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
>+++ b/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
>@@ -86,6 +86,9 @@ class Manager(object):
>         self._finder = LayoutTestFinder(self._port, self._options)
>         self._runner = LayoutTestRunner(self._options, self._port, self._printer, self._results_directory, self._test_is_slow)
> 
>+        test_options_json_path = self._port.path_from_webkit_base(self.LAYOUT_TESTS_DIRECTORY, "tests-options.json")
>+        self._tests_options = json.loads(self._filesystem.read_text_file(test_options_json_path)) if self._filesystem.exists(test_options_json_path) else {}
>+
>     def _collect_tests(self, args):
>         return self._finder.find_tests(self._options, args)
> 
>@@ -131,7 +134,9 @@ class Manager(object):
>             self._is_http_test(test_file))
> 
>     def _test_is_slow(self, test_file):
>-        return self._expectations.model().has_modifier(test_file, test_expectations.SLOW)
>+        if self._expectations.model().has_modifier(test_file, test_expectations.SLOW):
>+            return True
>+        return "slow" in self._tests_options.get(test_file, [])
> 
>     def needs_servers(self, test_names):
>         return any(self._is_http_test(test_name) for test_name in test_names) and self._options.http
>diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py b/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py
>index 6f8664b39332af5c936a723bb63ff319fdab08ba..7e64f8d162ec077321e9d539cf5352a454dceb08 100644
>--- a/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py
>+++ b/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py
>@@ -48,7 +48,8 @@ class ManagerTest(unittest.TestCase):
>             return 'imported/w3c/wpt'
> 
>         def get_manager():
>-            port = Mock()  # FIXME: Use a tighter mock.
>+            host = MockHost()
>+            port = host.port_factory.get()
>             port.TEST_PATH_SEPARATOR = '/'
>             port.web_platform_test_server_doc_root = get_wpt_doc_root
>             manager = Manager(port, options=MockOptions(http=True), printer=Mock())
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index b27a0e68a42a5532173bf19faa92aadabe494ba1..5daae83abe9036e94b68938956765983e4af7f4e 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,12 @@
>+2016-09-07  Youenn Fablet  <youenn@apple.com>
>+
>+        Using tests-options.json to compute whether tests are slow
>+        https://bugs.webkit.org/show_bug.cgi?id=161626
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestExpectations: Removing slow WPT expectations now that they are handled through tests-options.json.
>+
> 2016-09-06  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Marking http/tests/security/cross-origin-plugin-allowed.html as flaky on mac-wk2 release.
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index 3a345b67eab4ccaa7c65c0c7ece2a080be179685..8b5ec986b3b73f26a0f21167a8a32c14c7d72788 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -262,20 +262,6 @@ imported/w3c/web-platform-tests/dom/nodes/Document-createElement-namespace.html
> imported/w3c/web-platform-tests/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html [ Pass Failure ]
> imported/w3c/web-platform-tests/html/browsers/windows/targeting-cross-origin-nested-browsing-contexts.sub.html [ Pass Failure ]
> 
>-# W3C XMLHttpRequest tests
>-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-aborted.html [ Slow ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html [ Slow ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overrides.html [ Slow ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html [ Slow ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-simple.html [ Slow ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-synconmain.html [ Slow ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-twice.html [ Slow ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html [ Slow ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html [ Slow ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html [ Slow ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html [ Slow ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html [ Slow ]
>-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html [ Slow ]
> # XMLHttpRequest tests requiring DTR/WTR to allow other URLs than localhost to not be blocked and be reachable (www2.localhost)
> imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus.htm [ Skip ]
> imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-cors.htm [ Skip ]

Actions: View | Formatted Diff | Diff

Attachments on bug 161626: 288018 | 288119 | 288120