Bug 88946 – webkitpy: update callers to use port.expectation_dict() instead of test_expectations() and test_expectations_overrides()

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Dirk Pranke]

webkitpy: update callers to use port.expectation_dict() instead of test_expectations() and test_expectations_overrides()

[Dirk Pranke]

Created attachment 147217 [details]
Patch

[Ojan Vafai]

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.

[Dirk Pranke]

(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.

[Dirk Pranke]

Committed r120240: <http://trac.webkit.org/changeset/120240>