rename rebaseline_server JSON constants to be more consistent

gm/rebaseline_server/compare_rendered_pictures.py

 #!/usr/bin/python
 
 """
 Copyright 2014 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 Compare results of two render_pictures runs.
 """
@@ skipping 90 matching lines @@
     logging.info('Comparing subdirs %s and %s...' % (subdirA, subdirB))
 
     all_image_pairs = imagepairset.ImagePairSet(
         descriptions=subdirs,
         diff_base_url=self._diff_base_url)
     failing_image_pairs = imagepairset.ImagePairSet(
         descriptions=subdirs,
         diff_base_url=self._diff_base_url)
 
     all_image_pairs.ensure_extra_column_values_in_summary(
-        column_id=results.KEY__EXTRACOLUMN__RESULT_TYPE, values=[
+        column_id=results.KEY__EXTRACOLUMNS__RESULT_TYPE, values=[
             results.KEY__RESULT_TYPE__FAILED,
             results.KEY__RESULT_TYPE__NOCOMPARISON,
             results.KEY__RESULT_TYPE__SUCCEEDED,
         ])
     failing_image_pairs.ensure_extra_column_values_in_summary(
-        column_id=results.KEY__EXTRACOLUMN__RESULT_TYPE, values=[
+        column_id=results.KEY__EXTRACOLUMNS__RESULT_TYPE, values=[
             results.KEY__RESULT_TYPE__FAILED,
             results.KEY__RESULT_TYPE__NOCOMPARISON,
         ])
 
     common_dict_paths = sorted(set(subdirA_dicts.keys() + subdirB_dicts.keys()))
     num_common_dict_paths = len(common_dict_paths)
     dict_num = 0
     for dict_path in common_dict_paths:
       dict_num += 1
       logging.info('Generating pixel diffs for dict #%d of %d, "%s"...' %
@@ skipping 29 matching lines @@
             imagepairs_for_this_skp.append(self._create_image_pair(
                 test=skp_name,
                 config='%s-%d' % (gm_json.JSONKEY_SOURCE_TILEDIMAGES, tile_num),
                 image_dict_A=tiled_images_A[tile_num],
                 image_dict_B=tiled_images_B[tile_num]))
 
         for imagepair in imagepairs_for_this_skp:
           if imagepair:
             all_image_pairs.add_image_pair(imagepair)
             result_type = imagepair.extra_columns_dict\
-                [results.KEY__EXTRACOLUMN__RESULT_TYPE]
+                [results.KEY__EXTRACOLUMNS__RESULT_TYPE]
             if result_type != results.KEY__RESULT_TYPE__SUCCEEDED:
               failing_image_pairs.add_image_pair(imagepair)
 
     self._results = {
       results.KEY__HEADER__RESULTS_ALL: all_image_pairs.as_dict(),
       results.KEY__HEADER__RESULTS_FAILURES: failing_image_pairs.as_dict(),
     }
 
   def _validate_dict_version(self, result_dict):
     """Raises Exception if the dict is not the type/version we know how to read.
@@ skipping 46 matching lines @@
     if not imageA_checksum:
       result_type = results.KEY__RESULT_TYPE__NOCOMPARISON
     elif not imageB_checksum:
       result_type = results.KEY__RESULT_TYPE__NOCOMPARISON
     elif imageA_checksum == imageB_checksum:
       result_type = results.KEY__RESULT_TYPE__SUCCEEDED
     else:
       result_type = results.KEY__RESULT_TYPE__FAILED
 
     extra_columns_dict = {
-        results.KEY__EXTRACOLUMN__CONFIG: config,
-        results.KEY__EXTRACOLUMN__RESULT_TYPE: result_type,
-        results.KEY__EXTRACOLUMN__TEST: test,
+        results.KEY__EXTRACOLUMNS__CONFIG: config,
+        results.KEY__EXTRACOLUMNS__RESULT_TYPE: result_type,
+        results.KEY__EXTRACOLUMNS__TEST: test,
         # TODO(epoger): Right now, the client UI crashes if it receives
         # results that do not include this column.
         # Until we fix that, keep the client happy.
-        results.KEY__EXTRACOLUMN__BUILDER: 'TODO',
+        results.KEY__EXTRACOLUMNS__BUILDER: 'TODO',
     }
 
     try:
       return imagepair.ImagePair(
           image_diff_db=self._image_diff_db,
           base_url=self._image_base_url,
           imageA_relative_url=imageA_relative_url,
           imageB_relative_url=imageB_relative_url,
           extra_columns=extra_columns_dict)
     except (KeyError, TypeError):
       logging.exception(
           'got exception while creating ImagePair for'
           ' test="%s", config="%s", urlPair=("%s","%s")' % (
               test, config, imageA_relative_url, imageB_relative_url))
       return None
 
 
 # TODO(epoger): Add main() so this can be called by vm_run_skia_try.sh