More improvements to HTTP baseline viewer (for GM results)

gm/rebaseline_server/results.py

 #!/usr/bin/python
 
 '''
 Copyright 2013 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 '''
 
 '''
@@ skipping 106 matching lines @@
     """Gathers the results of all tests, across all builders (based on the
     contents of actual_builder_dicts and expected_builder_dicts)
     and returns it in a list in the same form needed for self.GetAll().
 
     This is a static method, because once we start refreshing results
     asynchronously, we need to make sure we are not corrupting the object's
     member variables.
     """
     test_data = []
     category_dict = {}
+    Results._EnsureIncludedInCategoryDict(category_dict, 'resultType', [
+        gm_json.JSONKEY_ACTUALRESULTS_FAILED,
+        gm_json.JSONKEY_ACTUALRESULTS_FAILUREIGNORED,
+        gm_json.JSONKEY_ACTUALRESULTS_NOCOMPARISON,
+        gm_json.JSONKEY_ACTUALRESULTS_SUCCEEDED,
+        ])
+
     for builder in sorted(actual_builder_dicts.keys()):
       actual_results_for_this_builder = (
           actual_builder_dicts[builder][gm_json.JSONKEY_ACTUALRESULTS])
       for result_type in sorted(actual_results_for_this_builder.keys()):
         results_of_this_type = actual_results_for_this_builder[result_type]
         if not results_of_this_type:
           continue
         for image_name in sorted(results_of_this_type.keys()):
           actual_image = results_of_this_type[image_name]
           try:
@@ skipping 61 matching lines @@
               "builder": builder,
               "test": test,
               "config": config,
               "resultType": updated_result_type,
               "actualHashType": actual_image[0],
               "actualHashDigest": str(actual_image[1]),
               "expectedHashType": expected_image[0],
               "expectedHashDigest": str(expected_image[1]),
           }
           Results._AddToCategoryDict(category_dict, results_for_this_test)
-
-          # TODO(epoger): For now, don't include succeeded results in the raw
-          # data. There are so many of them that they make the client too slow.
-          if updated_result_type != gm_json.JSONKEY_ACTUALRESULTS_SUCCEEDED:
-            test_data.append(results_for_this_test)
+          test_data.append(results_for_this_test)
     return {"categories": category_dict, "testData": test_data}
 
   @staticmethod
   def _AddToCategoryDict(category_dict, test_results):
-    """Add test_results to the category dictionary we are building
-    (see documentation of self.GetAll() for the format of this dictionary).
+    """Add test_results to the category dictionary we are building.
+    (See documentation of self.GetAll() for the format of this dictionary.)
 
     params:
       category_dict: category dict-of-dicts to add to; modify this in-place
       test_results: test data with which to update category_list, in a dict:
          {
            "category_name": "category_value",
            "category_name": "category_value",
            ...
          }
     """
     for category in CATEGORIES_TO_SUMMARIZE:
       category_value = test_results.get(category)
       if not category_value:
         continue  # test_results did not include this category, keep going
       if not category_dict.get(category):
         category_dict[category] = {}
       if not category_dict[category].get(category_value):
         category_dict[category][category_value] = 0
       category_dict[category][category_value] += 1
+
+  @staticmethod
+  def _EnsureIncludedInCategoryDict(category_dict,
+                                    category_name, category_values):
+    """Ensure that the category name/value pairs are included in category_dict,
+    even if there aren't any results with that name/value pair.
+    (See documentation of self.GetAll() for the format of this dictionary.)
+
+    params:
+      category_dict: category dict-of-dicts to modify
+      category_name: category name, as a string
+      category_values: list of values we want to make sure are represented
+                       for this category
+    """
+    if not category_dict.get(category_name):
+      category_dict[category_name] = {}
+    for category_value in category_values:
+      if not category_dict[category_name].get(category_value):
+        category_dict[category_name][category_value] = 0