[I-Spy] Add utilities to help manage expectations that track Chrome versions.

chrome/test/functional/ispy/common/ispy_utils.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utilities for managing I-Spy test results in Google Cloud Storage."""
 
 import collections
 import itertools
 import json
 import os
@@ skipping 68 matching lines @@
   def UpdateImage(self, full_path, image):
     """Updates an existing image in GS, preserving permissions and metadata.
 
     Args:
       full_path: the path to the file in GS including the file extension.
       image: a RGB PIL.Image.
     """
     self.cloud_bucket.UpdateFile(full_path, image_tools.EncodePNG(image))
 
 
-  def UploadExpectation(self, expectation, images):
+  def GenerateExpectation(self, expectation, images):
     """Creates and uploads an expectation to GS from a set of images and name.
 
     This method generates a mask from the uploaded images, then
       uploads the mask and first of the images to GS as a expectation.
 
     Args:
       expectation: name for this expectation, any existing expectation with the
         name will be replaced.
       images: a list of RGB encoded PIL.Images
     """
     mask = image_tools.InflateMask(image_tools.CreateMask(images), 7)
     self.UploadImage(
         GetExpectationPath(expectation, 'expected.png'), images[0])
     self.UploadImage(GetExpectationPath(expectation, 'mask.png'), mask)
 
-  def RunTest(self, test_run, expectation, actual):
+  def PerformComparison(self, test_run, expectation, actual):
     """Runs an image comparison, and uploads discrepancies to GS.
 
     Args:
       test_run: the name of the test_run.
       expectation: the name of the expectation to use for comparison.
       actual: an RGB-encoded PIL.Image that is the actual result.
 
     Raises:
       cloud_bucket.NotFoundError: if the given expectation is not found.
     """
@@ skipping 67 matching lines @@
     """Removes an expectation and all associated failures with that test.
 
     Args:
       expectation: the name of the expectation to remove.
     """
     test_paths = self.cloud_bucket.GetAllPaths(
         GetExpectationPath(expectation))
     for path in test_paths:
       self.cloud_bucket.RemoveFile(path)
 
-  def UploadExpectationPinkOut(self, expectation, images, pint_out, rgb):
+  def GenerateExpectationPinkOut(self, expectation, images, pint_out, rgb):
     """Uploads an ispy-test to GS with the pink_out workaround.
 
     Args:
       expectation: the name of the expectation to be uploaded.
       images: a json encoded list of base64 encoded png images.
       pink_out: an image.
       RGB: a json list representing the RGB values of a color to mask out.
     """
     # convert the pink_out into a mask
     black = (0, 0, 0, 255)
@@ skipping 50 matching lines @@
 
     Args:
       prefix: the prefix to filter files in GS by.
 
     Returns:
       a list containing urls to all objects that started with
          the prefix.
     """
     return self.cloud_bucket.GetAllPaths(prefix)