summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-05 19:07:26 +0000
committerdpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-05 19:07:26 +0000
commita8be454537a94cd370d8c8098c48023dfea941e8 (patch)
tree302d2263560bbd873f2622f10e1bdd7e5a0944ac
parentdc17bd1d3f3bdccc639c999b6dbe65a8c100f1e7 (diff)
downloadchromium_src-a8be454537a94cd370d8c8098c48023dfea941e8.zip
chromium_src-a8be454537a94cd370d8c8098c48023dfea941e8.tar.gz
chromium_src-a8be454537a94cd370d8c8098c48023dfea941e8.tar.bz2
Fix FIXABLE_COUNT in the json results to include skipped files.
TBR=ojan@chromium.org BUG=none TEST=none Review URL: http://codereview.chromium.org/460096 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33930 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/layout_package/json_results_generator.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/layout_package/json_results_generator.py b/webkit/tools/layout_tests/layout_package/json_results_generator.py
index 987f6a2..1f72414 100644
--- a/webkit/tools/layout_tests/layout_package/json_results_generator.py
+++ b/webkit/tools/layout_tests/layout_package/json_results_generator.py
@@ -267,9 +267,11 @@ class JSONResultsGenerator:
results_for_builder: Dictionary containing the test results for a single
builder.
"""
+ summary = self._result_summary
self._InsertItemIntoRawList(results_for_builder,
- len(set(self._result_summary.failures.keys()) &
- self._result_summary.tests_by_timeline[test_expectations.NOW]),
+ len((set(summary.failures.keys()) |
+ summary.tests_by_expectation[test_expectations.SKIP]) &
+ summary.tests_by_timeline[test_expectations.NOW]),
self.FIXABLE_COUNT)
self._InsertItemIntoRawList(results_for_builder,
len(self._expectations.GetTestsWithTimeline(test_expectations.NOW)),