nrwt: implement the actual cascade of TestExpectations
authordpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Jun 2012 20:43:13 +0000 (20:43 +0000)
committerdpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Jun 2012 20:43:13 +0000 (20:43 +0000)
commit022e81b3abf629b2a5e4d84789ddbb3f44c0fdc1
tree2495445309ec2683b4c3f7184ebe1fca72a18a4a
parentfac52379d8b5459315a83303ff50a0a5f664b6cb
nrwt: implement the actual cascade of TestExpectations
https://bugs.webkit.org/show_bug.cgi?id=88947

Reviewed by Ojan Vafai.

This change implements the actual cascade by removing the
concept of 'overrides' from the TestExpectations object and
parsing each file separately.

There is an actual semantic change in this patch, in that
setting an expectation on a directory in one file will override
the expectations on any individual tests set in prior files. The
test_overrides__directory() unit test verifies this.

Otherwise, this patch mostly consists of deleting code :).

* Scripts/webkitpy/layout_tests/models/test_expectations.py:
(TestExpectationsModel.__init__):
(TestExpectationsModel.add_expectation_line):
(TestExpectationsModel._add_test):
(TestExpectationsModel._already_seen_better_match):
(TestExpectations.__init__):
(TestExpectations._add_expectations):
* Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:
(test_overrides__directory):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@120243 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py