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

gm/rebaseline_server/imagepair_test.py

Index: gm/rebaseline_server/imagepair_test.py
diff --git a/gm/rebaseline_server/imagepair_test.py b/gm/rebaseline_server/imagepair_test.py
index fc1f2759e71ed53887c1578a784709976ca2a6ba..d29438e5306ffa491e0c63e10a7caea0b6b0bc12 100755
--- a/gm/rebaseline_server/imagepair_test.py
+++ b/gm/rebaseline_server/imagepair_test.py
@@ -32,11 +32,11 @@ class ImagePairTest(unittest.TestCase):
     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:
@@ -65,7 +65,7 @@ class ImagePairTest(unittest.TestCase):
             },
             # expected output:
             {
-                'extraColumnValues': {
+                'extraColumns': {
                     'builder': 'MyBuilder',
                     'test': 'MyTest',
                 },
@@ -115,11 +115,11 @@ class ImagePairTest(unittest.TestCase):
                     'percentDifferingPixels': 100.00,
                     'weightedDiffMeasure': 66.66666666666667,
                 },
-                'expectationsData': {
+                'expectations': {
                     'bugs': [1001, 1002],
                     'ignoreFailure': True,
                 },
-                'extraColumnValues': {
+                'extraColumns': {
                     'builder': 'MyBuilder',
                     'test': 'MyTest',
                 },