rebaseline_server: extend returned JSON dict to allow for result-editing in coming CL

gm/rebaseline_server/results.py

 #!/usr/bin/python
 
 '''

[jcgregorio, 2013/10/09 14:41:48]

What Python coding standard are we using?

[epoger, 2013/10/09 15:35:30]

All of them. :-)

But seriously, folks,
https://sites.google.com/site/skiadocs/developer-documentation/contributing-c...
does not specify any Python style guidelines.  I guess we should pick one.  Any
suggestions, Joe?

[borenet, 2013/10/09 15:43:17]

I thought we were using the Google style guide:
http://google-styleguide.googlecode.com/svn/trunk/pyguide.html

Though it's not documented and we're certainly not strict...

[jcgregorio, 2013/10/09 15:49:47]

OK, the code looks close to that style, but I didn't want to start suggesting
changes until I knew which guide we were following.

On 2013/10/09 15:43:17, borenet wrote:
Yeah, updating the docs to point to that would be good. If someone wants to add
me to the site I can do it.

 Copyright 2013 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 '''
 
 '''
 Repackage expected/actual GM results as needed by our HTML rebaseline viewer.
 '''
 
@@ skipping 57 matching lines @@
              "Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug": 1286,
              "Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release": 1134,
              ...
            },
            ... # other categories from CATEGORIES_TO_SUMMARIZE
          }, # end of "categories" dictionary
 
          "testData": # list of test results, with a dictionary for each
          [
            {
+             "index": 0,   # index of this result within testData list

[epoger, 2013/10/09 05:52:16]

We may or may not use these indices when sending modifications back to the
server... but they will definitely be useful for tracking checked/unchecked test
results on the client side.

              "builder": "Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug",
              "test": "bigmatrix",
              "config": "8888",
              "resultType": "failed",
              "expectedHashType": "bitmap-64bitMD5",
              "expectedHashDigest": "10894408024079689926",
              "actualHashType": "bitmap-64bitMD5",
              "actualHashDigest": "2409857384569",
            },
            ...
@@ skipping 104 matching lines @@
           # categories recorded within the gm_actuals AT ALL, and
           # instead evaluate the result_type ourselves based on what
           # we see in expectations vs actual checksum?
           if expected_image == actual_image:
             updated_result_type = gm_json.JSONKEY_ACTUALRESULTS_SUCCEEDED
           else:
             updated_result_type = result_type
 
           (test, config) = IMAGE_FILENAME_RE.match(image_name).groups()
           results_for_this_test = {
+              "index": len(test_data),
               "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)
@@ skipping 35 matching lines @@
       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