rebaseline_server JSON: pass category values as values, not keys

gm/rebaseline_server/compare_to_expectations.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.
 
 Repackage expected/actual GM results as needed by our HTML rebaseline viewer.
 """
@@ skipping 298 matching lines @@
           # from the most recent actuals).  Treat these as successes
           # instead of failures.
           #
           # TODO(epoger): Do we need to do something similar in
           # other cases, such as when we have recently marked a test
           # as ignoreFailure but it still shows up in the 'failed'
           # category?  Maybe we should not rely on the result_type
           # 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?
+          # See related http://skbug.com/2514 ('rebaseline_server: apply
+          # ignored-tests.txt within rebaseline_server, not just on the bots')
           if expected_image_relative_url == actual_image_relative_url:
             updated_result_type = results.KEY__RESULT_TYPE__SUCCEEDED
           else:
             updated_result_type = result_type
           extra_columns_dict = {
               results.KEY__EXTRACOLUMN__RESULT_TYPE: updated_result_type,
               results.KEY__EXTRACOLUMN__BUILDER: builder,
               results.KEY__EXTRACOLUMN__TEST: test,
               results.KEY__EXTRACOLUMN__CONFIG: config,
           }
@@ skipping 47 matching lines @@
   results_obj = ExpectationComparisons(actuals_root=args.actuals,
                                        expected_root=args.expectations,
                                        generated_images_root=args.workdir)
   gm_json.WriteToFile(
       results_obj.get_packaged_results_of_type(results_type=args.results),
       args.outfile)
 
 
 if __name__ == '__main__':
   main()