Changeset 205480 in webkit

Timestamp:

Sep 6, 2016 9:01:54 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Using tests-options.json to compute whether tests are slow
​https://bugs.webkit.org/show_bug.cgi?id=161626

Patch by Youenn Fablet <​youenn@apple.com> on 2016-09-06
Reviewed by Darin Adler.

Tools:

• 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.

LayoutTests:

• TestExpectations: Removing slow WPT expectations now that they are handled through tests-options.json.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-06  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 Darin Adler.
+
+        * TestExpectations: Removing slow WPT expectations now that they are handled through tests-options.json.
+
 2016-09-06  Zalan Bujtas  <zalan@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -263 +263 @@
 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 ]

trunk/Tools/ChangeLog

@@ +1 @@
+2016-09-06  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 Darin Adler.
+
+        * 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  Commit Queue  <commit-queue@webkit.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

@@ -86 +86 @@
         self._finder = LayoutTestFinder(self._port, self._options)
         self._runner = LayoutTestRunner(self._options, self._port, self._printer, self._results_directory, self._test_is_slow)
+        self._tests_options = json.loads(self._filesystem.read_text_file(self._port.path_from_webkit_base(self.LAYOUT_TESTS_DIRECTORY, "tests-options.json")))
 
     def _collect_tests(self, args):
@@ -132 +133 @@
 
     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):