rebaseline_server: create ImagePairSet-- holds a number of ImagePairs to examine

gm/rebaseline_server/imagepair_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 imagepair.py
 """
@@ skipping 14 matching lines @@
 class ImagePairTest(unittest.TestCase):
 
   def setUp(self):
     self._temp_dir = tempfile.mkdtemp()
     self.maxDiff = None
 
   def tearDown(self):
     shutil.rmtree(self._temp_dir)
 
   def shortDescription(self):
-    """Tell unittest framework to not print docstrings for test cases."""
+    """Tells unittest framework to not print docstrings for test cases."""
     return None
 
   def test_endToEnd(self):
-    """Test ImagePair, using a real ImageDiffDB to download real images.
+    """Tests ImagePair, using a real ImageDiffDB to download real images.
 
     TODO(epoger): Either in addition to or instead of this end-to-end test,
     we should perform some tests using either:
     1. a mock ImageDiffDB, or
     2. a real ImageDiffDB that doesn't hit Google Storage looking for input
        image files (maybe a file:// IMG_URL_BASE)
     """
     # params for each self-test:
     #
     # inputs:
     #  0. imageA_relative_URL
     #  1. imageB_relative_URL
     #  2. expectations dict
     #  3. extra_columns dict
     # expected output:
     #  4. expected result of ImagePair.as_dict()
     selftests = [
         [
             # inputs:
             'arcofzorro/16206093933823793653.png',
             'arcofzorro/16206093933823793653.png',
             None,
             {
                 'builder': 'MyBuilder',
                 'test': 'MyTest',
             },
             # expected output:
             {
-                'extraColumnValues': {
+                'extraColumns': {
                     'builder': 'MyBuilder',
                     'test': 'MyTest',
                 },
                 'imageAUrl': 'arcofzorro/16206093933823793653.png',
                 'imageBUrl': 'arcofzorro/16206093933823793653.png',
                 'isDifferent': False,
             },
         ],
 
         [
@@ skipping 29 matching lines @@
                 'test': 'MyTest',
             },
             # expected output:
             {
                 'differenceData': {
                     'maxDiffPerChannel': [255, 0, 255],
                     'numDifferingPixels': 102400,
                     'percentDifferingPixels': 100.00,
                     'weightedDiffMeasure': 66.66666666666667,
                 },
-                'expectationsData': {
+                'expectations': {
                     'bugs': [1001, 1002],
                     'ignoreFailure': True,
                 },
-                'extraColumnValues': {
+                'extraColumns': {
                     'builder': 'MyBuilder',
                     'test': 'MyTest',
                 },
                 'imageAUrl':
                     'gradients_degenerate_2pt/10552995703607727960.png',
                 'imageBUrl':
                     'gradients_degenerate_2pt/11198253335583713230.png',
                 'isDifferent': True,
             },
         ],
@@ skipping 11 matching lines @@
       self.assertEqual(image_pair.as_dict(), selftest[4])
 
 
 def main():
   suite = unittest.TestLoader().loadTestsFromTestCase(ImagePairTest)
   unittest.TextTestRunner(verbosity=2).run(suite)
 
 
 if __name__ == '__main__':
   main()