Improve logic for stripping useless entries in the JSON.

Any time an entry is all no-data, we can strip it. Checking
the time only matters if it's all passes.
Review URL: http://codereview.chromium.org/174568

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24550 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 6 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 20c93ce..66e5786 100644
--- a/webkit/tools/layout_tests/layout_package/json_results_generator.py
+++ b/webkit/tools/layout_tests/layout_package/json_results_generator.py
@@ -106,6 +106,7 @@ class JSONResultsGenerator:
       try:
         results_json = simplejson.loads(old_results)
       except:
+        logging.error("Results file on disk was not valid JSON. Clobbering.")
         # The JSON file is not valid JSON. Just clobber the results.
         results_json = {}
 
@@ -214,12 +215,10 @@ class JSONResultsGenerator:
     test["results"] = results
     test["times"] = times
 
-    # If the test has all passes or all no-data (that wasn't just padded in) and
-    # times that take less than a second, remove it from the results to reduce
-    # noise and filesize.
-    if (max(times) >= self.MIN_TIME and num_results and
-        (results == num_build_numbers * self.PASS_RESULT or
-         results == num_build_numbers * self.NO_DATA_RESULT)):
+    # Remove all passes/no-data from the results to reduce noise and filesize.
+    if (results == num_build_numbers * self.NO_DATA_RESULT or
+        (max(times) <= self.MIN_TIME and num_results and
+         results == num_build_numbers * self.PASS_RESULT)):
       del tests[test_path]
 
     # Remove tests that don't exist anymore.