diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/common/net/resultsjsonparser.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/common/net/resultsjsonparser.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py b/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py index 99e8528de..d30ad55aa 100644 --- a/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py +++ b/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py @@ -34,6 +34,7 @@ from webkitpy.common.system.deprecated_logging import log # FIXME: common should never import from new-run-webkit-tests, one of these files needs to move. from webkitpy.layout_tests.layout_package import json_results_generator from webkitpy.layout_tests.models import test_expectations, test_results, test_failures +from webkitpy.layout_tests.models.test_expectations import TestExpectations # These are helper functions for navigating the results json structure. @@ -72,15 +73,15 @@ class JSONTestResult(object): expected_results = self._expected_as_tokens() # FIXME: We should only call remove_pixel_failures when this JSONResult # came from a test run without pixel tests! - if not test_expectations.has_pixel_failures(actual_results): - expected_results = test_expectations.remove_pixel_failures(expected_results) + if not TestExpectations.has_pixel_failures(actual_results): + expected_results = TestExpectations.remove_pixel_failures(expected_results) for actual_result in actual_results: - if not test_expectations.result_was_expected(actual_result, expected_results, False, False): + if not TestExpectations.result_was_expected(actual_result, expected_results, False, False): return False return True def _tokenize(self, results_string): - tokens = map(test_expectations.TestExpectations.expectation_from_string, results_string.split(' ')) + tokens = map(TestExpectations.expectation_from_string, results_string.split(' ')) if None in tokens: log("Unrecognized result in %s" % results_string) return set(tokens) |