Add ability to output ImageBaseGSUrl to render_picture and use in rebaseline server

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 61 matching lines @@
     self.maxDiff = None  # do not truncate diffs when tests fail
 
   def shortDescription(self):
     """Tells unittest framework to not print docstrings for test cases."""
     return None
 
   def test_success(self):
     """Assembles some ImagePairs into an ImagePairSet, and validates results.
     """
     image_pairs = [
-        MockImagePair(base_url=BASE_URL_1, dict_to_return=IMAGEPAIR_1_AS_DICT),
-        MockImagePair(base_url=BASE_URL_1, dict_to_return=IMAGEPAIR_2_AS_DICT),
-        MockImagePair(base_url=BASE_URL_1, dict_to_return=IMAGEPAIR_3_AS_DICT),
+        MockImagePair(imageA_base_url=BASE_URL_1, imageB_base_url=BASE_URL_1,
+                      dict_to_return=IMAGEPAIR_1_AS_DICT),
+        MockImagePair(imageA_base_url=BASE_URL_1, imageB_base_url=BASE_URL_1,
+                      dict_to_return=IMAGEPAIR_2_AS_DICT),
+        MockImagePair(imageA_base_url=BASE_URL_1, imageB_base_url=BASE_URL_1,
+                      dict_to_return=IMAGEPAIR_3_AS_DICT),
     ]
     expected_imageset_dict = {
         'extraColumnHeaders': {
             'builder': {
                 'headerText': 'builder',
                 'isFilterable': True,
                 'isSortable': True,
                 'useFreeformFilter': False,
                 'valuesAndCounts': [('MyBuilder', 3)],
             },
@@ skipping 48 matching lines @@
             header_url='http://learn/about/gm/tests',
             is_filterable=True,
             is_sortable=False))
     self.assertEqual(image_pair_set.as_dict(), expected_imageset_dict)
 
   def test_mismatched_base_url(self):
     """Confirms that mismatched base_urls will cause an exception."""
     image_pair_set = imagepairset.ImagePairSet(
         diff_base_url=DIFF_BASE_URL)
     image_pair_set.add_image_pair(
-        MockImagePair(base_url=BASE_URL_1, dict_to_return=IMAGEPAIR_1_AS_DICT))
+        MockImagePair(imageA_base_url=BASE_URL_1, imageB_base_url=BASE_URL_1,
+                      dict_to_return=IMAGEPAIR_1_AS_DICT))
     image_pair_set.add_image_pair(
-        MockImagePair(base_url=BASE_URL_1, dict_to_return=IMAGEPAIR_2_AS_DICT))
+        MockImagePair(imageA_base_url=BASE_URL_1, imageB_base_url=BASE_URL_1,
+                      dict_to_return=IMAGEPAIR_2_AS_DICT))
     with self.assertRaises(Exception):
       image_pair_set.add_image_pair(
-          MockImagePair(base_url=BASE_URL_2,
+          MockImagePair(imageA_base_url=BASE_URL_2, imageB_base_url=BASE_URL_2,
                         dict_to_return=IMAGEPAIR_3_AS_DICT))
 
   def test_missing_column_ids(self):
     """Confirms that passing truncated column_ids_in_order to as_dict()
     will cause an exception."""
     image_pair_set = imagepairset.ImagePairSet(
         diff_base_url=DIFF_BASE_URL)
     image_pair_set.add_image_pair(
-        MockImagePair(base_url=BASE_URL_1, dict_to_return=IMAGEPAIR_1_AS_DICT))
+        MockImagePair(imageA_base_url=BASE_URL_1, imageB_base_url=BASE_URL_1,
+                      dict_to_return=IMAGEPAIR_1_AS_DICT))
     image_pair_set.add_image_pair(
-        MockImagePair(base_url=BASE_URL_1, dict_to_return=IMAGEPAIR_2_AS_DICT))
+        MockImagePair(imageA_base_url=BASE_URL_1, imageB_base_url=BASE_URL_1,
+                      dict_to_return=IMAGEPAIR_2_AS_DICT))
     # Call as_dict() with default or reasonable column_ids_in_order.
     image_pair_set.as_dict()
     image_pair_set.as_dict(column_ids_in_order=['test', 'builder'])
     image_pair_set.as_dict(column_ids_in_order=['test', 'builder', 'extra'])
     # Call as_dict() with not enough column_ids.
     with self.assertRaises(Exception):
       image_pair_set.as_dict(column_ids_in_order=['builder'])
 
 
 class MockImagePair(object):
   """Mock ImagePair object, which will return canned results."""
-  def __init__(self, base_url, dict_to_return):
+  def __init__(self, imageA_base_url, imageB_base_url, dict_to_return):
     """
     Args:
       base_url: base_url attribute for this object
       dict_to_return: dictionary to return from as_dict()
     """
-    self.base_url = base_url
+    self.imageA_base_url = imageA_base_url
+    self.imageB_base_url = imageB_base_url
     self.extra_columns_dict = dict_to_return.get(
         imagepair.KEY__IMAGEPAIRS__EXTRACOLUMNS, None)
     self._dict_to_return = dict_to_return
 
   def as_dict(self):
     return self._dict_to_return
 
 
 def main():
   suite = unittest.TestLoader().loadTestsFromTestCase(ImagePairSetTest)
   unittest.TextTestRunner(verbosity=2).run(suite)
 
 
 if __name__ == '__main__':
   main()