Bug 88946 - webkitpy: update callers to use port.expectation_dict() instead of test_expectations() and test_expectations_overrides()
Summary: webkitpy: update callers to use port.expectation_dict() instead of test_expec...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Dirk Pranke
URL:
Keywords:
Depends on: 88944 88945
Blocks: 65834 88947
  Show dependency treegraph
 
Reported: 2012-06-12 19:38 PDT by Dirk Pranke
Modified: 2012-06-13 13:14 PDT (History)
4 users (show)

See Also:


Attachments
Patch (13.19 KB, patch)
2012-06-12 19:39 PDT, Dirk Pranke
ojan: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Dirk Pranke 2012-06-12 19:38:38 PDT
webkitpy: update callers to use port.expectation_dict() instead of test_expectations() and test_expectations_overrides()
Comment 1 Dirk Pranke 2012-06-12 19:39:34 PDT
Created attachment 147217 [details]
Patch
Comment 2 Ojan Vafai 2012-06-13 09:34:53 PDT
Comment on attachment 147217 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=147217&action=review

> Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py:764
> +        if len(expectations_dict) > 1 and include_overrides:

Side nit: why do we even have an include_overrides boolean? It seems like this should go away, esp as we're adding cascading.
Comment 3 Dirk Pranke 2012-06-13 10:09:09 PDT
(In reply to comment #2)
> (From update of attachment 147217 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=147217&action=review
> 
> > Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py:764
> > +        if len(expectations_dict) > 1 and include_overrides:
> 
> Side nit: why do we even have an include_overrides boolean? It seems like this should go away, esp as we're adding cascading.

This is needed when we're writing the file out again after running webkit-patch rebaseline-expectations; because that command is not aware of the cascade, it cats the contents of all of the files into the main file. With the flag, we don't remove any REBASELINEs from other files in the cascade, which is okay for chromium, but won't work when we have real cascades instead of overrides.

Fixing this is a separate issue that I'll work on after this series of patches land.
Comment 4 Dirk Pranke 2012-06-13 13:14:57 PDT
Committed r120240: <http://trac.webkit.org/changeset/120240>