Changeset 205486 in webkit


Ignore:
Timestamp:
Sep 6, 2016 9:45:38 AM (8 years ago)
Author:
commit-queue@webkit.org
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

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r205482 r205486  
     12016-09-06  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r205480.
     4        https://bugs.webkit.org/show_bug.cgi?id=161630
     5
     6        tests-options.json is not known from knockout filesystem
     7        (Requested by youenn on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Using tests-options.json to compute whether tests are slow"
     12        https://bugs.webkit.org/show_bug.cgi?id=161626
     13        http://trac.webkit.org/changeset/205480
     14
    1152016-09-06  Ryan Haddad  <ryanhaddad@apple.com>
    216

  • trunk/LayoutTests/TestExpectations

    r205481 r205486  
    263263imported/w3c/web-platform-tests/html/browsers/windows/targeting-cross-origin-nested-browsing-contexts.sub.html [ Pass Failure ]
    264264
     265# W3C XMLHttpRequest tests
     266imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-aborted.html [ Slow ]
     267imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html [ Slow ]
     268imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overrides.html [ Slow ]
     269imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html [ Slow ]
     270imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-simple.html [ Slow ]
     271imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-synconmain.html [ Slow ]
     272imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-twice.html [ Slow ]
     273imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html [ Slow ]
     274imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html [ Slow ]
     275imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html [ Slow ]
     276imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html [ Slow ]
     277imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html [ Slow ]
     278imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html [ Slow ]
    265279# XMLHttpRequest tests requiring DTR/WTR to allow other URLs than localhost to not be blocked and be reachable (www2.localhost)
    266280imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus.htm [ Skip ]

  • trunk/Tools/ChangeLog

    r205483 r205486  
     12016-09-06  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r205480.
     4        https://bugs.webkit.org/show_bug.cgi?id=161630
     5
     6        tests-options.json is not known from knockout filesystem
     7        (Requested by youenn on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Using tests-options.json to compute whether tests are slow"
     12        https://bugs.webkit.org/show_bug.cgi?id=161626
     13        http://trac.webkit.org/changeset/205480
     14
    1152016-09-06  Michael Catanzaro  <mcatanzaro@igalia.com>
    216

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

    r205480 r205486  
    8686        self._finder = LayoutTestFinder(self._port, self._options)
    8787        self._runner = LayoutTestRunner(self._options, self._port, self._printer, self._results_directory, self._test_is_slow)
    88         self._tests_options = json.loads(self._filesystem.read_text_file(self._port.path_from_webkit_base(self.LAYOUT_TESTS_DIRECTORY, "tests-options.json")))
    8988
    9089    def _collect_tests(self, args):
    … …  
    133132
    134133    def _test_is_slow(self, test_file):
    135         if self._expectations.model().has_modifier(test_file, test_expectations.SLOW):
    136             return True
    137         return "slow" in self._tests_options.get(test_file, [])
     134        return self._expectations.model().has_modifier(test_file, test_expectations.SLOW)
    138135
    139136    def needs_servers(self, test_names):
Note: See TracChangeset for help on using the changeset viewer.