Chromium Code Reviews| Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py |
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py |
| index 3dbf4060e7c1ddf396687514743b441f52a26d28..df91edc0a230c016a530e1c27a6978674da58d0d 100644 |
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py |
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py |
| @@ -969,18 +969,23 @@ class TestExpectations(object): |
| return set(suffixes) |
| @staticmethod |
| - def suffixes_for_actual_expectations_string(expectations): |
| + # test_result is an instance of webkitpy.common.net.layouttestresults.LayoutTestResult |
| + def suffixes_for_test_result(test_result): |
|
wkorman
2016/06/14 19:09:19
Could potentially add unit tests for this and buil
|
| suffixes = set() |
| - if 'TEXT' in expectations: |
| - suffixes.add('txt') |
| - if 'IMAGE' in expectations: |
| - suffixes.add('png') |
| - if 'AUDIO' in expectations: |
| - suffixes.add('wav') |
| - if 'MISSING' in expectations: |
| + actual_results = test_result.actual_results() |
| + if 'TEXT' in actual_results: |
| suffixes.add('txt') |
| + if 'IMAGE' in actual_results: |
| suffixes.add('png') |
| + if 'AUDIO' in actual_results: |
| suffixes.add('wav') |
| + if 'MISSING' in actual_results: |
| + if test_result.is_missing_text(): |
| + suffixes.add('txt') |
| + if test_result.is_missing_image(): |
| + suffixes.add('png') |
| + if test_result.is_missing_audio(): |
| + suffixes.add('wav') |
| return suffixes |
| # FIXME: This constructor does too much work. We should move the actual parsing of |