Title: [205480] trunk
- Revision
- 205480
- Author
- [email protected]
- Date
- 2016-09-06 09:01:54 -0700 (Tue, 06 Sep 2016)
Log Message
Using tests-options.json to compute whether tests are slow
https://bugs.webkit.org/show_bug.cgi?id=161626
Patch by Youenn Fablet <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (205479 => 205480)
--- trunk/LayoutTests/ChangeLog 2016-09-06 16:00:11 UTC (rev 205479)
+++ trunk/LayoutTests/ChangeLog 2016-09-06 16:01:54 UTC (rev 205480)
@@ -1,3 +1,12 @@
+2016-09-06 Youenn Fablet <[email protected]>
+
+ 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 <[email protected]>
ASSERTION FAILED: !currBox->needsLayout() in WebCore::RenderBlock::checkPositionedObjectsNeedLayout
Modified: trunk/LayoutTests/TestExpectations (205479 => 205480)
--- trunk/LayoutTests/TestExpectations 2016-09-06 16:00:11 UTC (rev 205479)
+++ trunk/LayoutTests/TestExpectations 2016-09-06 16:01:54 UTC (rev 205480)
@@ -262,20 +262,6 @@
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 ]
Modified: trunk/Tools/ChangeLog (205479 => 205480)
--- trunk/Tools/ChangeLog 2016-09-06 16:00:11 UTC (rev 205479)
+++ trunk/Tools/ChangeLog 2016-09-06 16:01:54 UTC (rev 205480)
@@ -1,3 +1,14 @@
+2016-09-06 Youenn Fablet <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r205461.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (205479 => 205480)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2016-09-06 16:00:11 UTC (rev 205479)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2016-09-06 16:01:54 UTC (rev 205480)
@@ -85,6 +85,7 @@
self._results_directory = self._port.results_directory()
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):
return self._finder.find_tests(self._options, args)
@@ -131,7 +132,9 @@
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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
