Title: [205486] trunk
- Revision
- 205486
- Author
- [email protected]
- Date
- 2016-09-06 09:45:38 -0700 (Tue, 06 Sep 2016)
Log Message
Unreviewed, rolling out r205480.
https://bugs.webkit.org/show_bug.cgi?id=161630
tests-options.json is not known from knockout filesystem
(Requested by youenn on #webkit).
Reverted changeset:
"Using tests-options.json to compute whether tests are slow"
https://bugs.webkit.org/show_bug.cgi?id=161626
http://trac.webkit.org/changeset/205480
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (205485 => 205486)
--- trunk/LayoutTests/ChangeLog 2016-09-06 16:28:03 UTC (rev 205485)
+++ trunk/LayoutTests/ChangeLog 2016-09-06 16:45:38 UTC (rev 205486)
@@ -1,3 +1,17 @@
+2016-09-06 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r205480.
+ https://bugs.webkit.org/show_bug.cgi?id=161630
+
+ tests-options.json is not known from knockout filesystem
+ (Requested by youenn on #webkit).
+
+ Reverted changeset:
+
+ "Using tests-options.json to compute whether tests are slow"
+ https://bugs.webkit.org/show_bug.cgi?id=161626
+ http://trac.webkit.org/changeset/205480
+
2016-09-06 Ryan Haddad <[email protected]>
Rebaseline http/tests/cookies/third-party-cookie-relaxing.html for Sierra.
Modified: trunk/LayoutTests/TestExpectations (205485 => 205486)
--- trunk/LayoutTests/TestExpectations 2016-09-06 16:28:03 UTC (rev 205485)
+++ trunk/LayoutTests/TestExpectations 2016-09-06 16:45:38 UTC (rev 205486)
@@ -262,6 +262,20 @@
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 (205485 => 205486)
--- trunk/Tools/ChangeLog 2016-09-06 16:28:03 UTC (rev 205485)
+++ trunk/Tools/ChangeLog 2016-09-06 16:45:38 UTC (rev 205486)
@@ -1,3 +1,17 @@
+2016-09-06 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r205480.
+ https://bugs.webkit.org/show_bug.cgi?id=161630
+
+ tests-options.json is not known from knockout filesystem
+ (Requested by youenn on #webkit).
+
+ Reverted changeset:
+
+ "Using tests-options.json to compute whether tests are slow"
+ https://bugs.webkit.org/show_bug.cgi?id=161626
+ http://trac.webkit.org/changeset/205480
+
2016-09-06 Michael Catanzaro <[email protected]>
"Redundant argument in sprintf" warning spam from prepare-ChangeLog
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (205485 => 205486)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2016-09-06 16:28:03 UTC (rev 205485)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2016-09-06 16:45:38 UTC (rev 205486)
@@ -85,7 +85,6 @@
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)
@@ -132,9 +131,7 @@
self._is_http_test(test_file))
def _test_is_slow(self, test_file):
- if self._expectations.model().has_modifier(test_file, test_expectations.SLOW):
- return True
- return "slow" in self._tests_options.get(test_file, [])
+ return self._expectations.model().has_modifier(test_file, test_expectations.SLOW)
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
