rebaseline_server: make intermediate JSON specify base urls for diff images

gm/rebaseline_server/imagepairset_test.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.
 
 Test imagepairset.py
 """
@@ skipping 88 matching lines @@
                 'headerUrl': 'http://learn/about/gm/tests',
                 'isFilterable': True,
                 'isSortable': False,
             },
         },
         'imagePairs': [
             IMAGEPAIR_1_AS_DICT,
             IMAGEPAIR_2_AS_DICT,
             IMAGEPAIR_3_AS_DICT,
         ],
-        'imageSets': [
-            {
+        'imageSets': {
+            'imageA': {
                 'baseUrl': BASE_URL_1,
                 'description': SET_A_DESCRIPTION,
             },
-            {
+            'imageB': {
                 'baseUrl': BASE_URL_1,
                 'description': SET_B_DESCRIPTION,
             },
-        ],
+            'diffs': {
+                'baseUrl': '/static/generated-images/diffs',
+                'description': 'color difference per channel',
+            },
+            'whiteDiffs': {
+                'baseUrl': '/static/generated-images/whitediffs',
+                'description': 'differing pixels in white',
+            },
+        },
     }
 
     image_pair_set = imagepairset.ImagePairSet(
         descriptions=(SET_A_DESCRIPTION, SET_B_DESCRIPTION))
     for image_pair in image_pairs:
       image_pair_set.add_image_pair(image_pair)
     # The 'builder' column header uses the default settings,
     # but the 'test' column header has manual adjustments.
     image_pair_set.set_column_header_factory(
         'test',
@@ skipping 35 matching lines @@
     return self._dict_to_return
 
 
 def main():
   suite = unittest.TestLoader().loadTestsFromTestCase(ImagePairSetTest)
   unittest.TextTestRunner(verbosity=2).run(suite)
 
 
 if __name__ == '__main__':
   main()