Changeset 90823 in webkit
- Timestamp:
- Jul 12, 2011 10:49:27 AM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r90822 r90823 1 2011-07-12 Adam Barth <abarth@webkit.org> 2 3 cr-linux-ews complains about tests that aren't actually failing 4 https://bugs.webkit.org/show_bug.cgi?id=64367 5 6 The underlying problem here is that full_results.json doesn't have 7 enough information to determine whether a given test result was 8 expected because whether an actual result is expected depends on 9 whether full_results.json was generated duing a test run that included 10 pixel tests. 11 12 The right long-term solution is to make full_results.json a complete 13 description of what happened durning a test run. In this patch 14 however, to stop the spam, this patch makes the jsonresultsparser 15 ignore pixel failures. 16 17 (I'm landing this patch unreviewed in order to stop the bots from 18 spamming. I'll happily address any review comments in a follow-up 19 patch.) 20 21 * Scripts/webkitpy/common/net/resultsjsonparser.py: 22 * Scripts/webkitpy/common/net/resultsjsonparser_unittest.py: 23 1 24 2011-07-12 Adam Barth <abarth@webkit.org> 2 25 -
trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py
r90539 r90823 74 74 actual_results = self._actual_as_tokens() 75 75 expected_results = self._expected_as_tokens() 76 # FIXME: We should only remove_pixel_failures this JSONResult can from a run without pixel tests! 77 if not test_expectations.has_pixel_failures(actual_results): 78 expected_results = test_expectations.remove_pixel_failures(expected_results) 76 79 for actual_result in actual_results: 77 80 if not test_expectations.result_was_expected(actual_result, expected_results, False, False): … … 83 86 if None in tokens: 84 87 log("Unrecognized result in %s" % results_string) 85 return tokens88 return set(tokens) 86 89 87 90 @memoized -
trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser_unittest.py
r90546 r90823 59 59 "expected": "PASS", 60 60 "actual": "TEXT PASS" 61 }, 62 "prototype-peach.html": { 63 "expected": "IMAGE+TEXT", 64 "actual": "TEXT" 61 65 } 62 66 } -
trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
r90547 r90823 85 85 86 86 87 def has_pixel_failures(actual_results): 88 return IMAGE in actual_results or IMAGE_PLUS_TEXT in actual_results 89 90 87 91 def strip_comments(line): 88 92 """Strips comments from a line and return None if the line is empty
Note: See TracChangeset
for help on using the changeset viewer.