svndiff.py: add ability to compare before-and-after JSON files, not just raw images

tools/rebaseline.py

 #!/usr/bin/python
 
 '''
 Copyright 2012 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 '''
 
 '''
 Rebaselines the given GM tests, on all bots and all configurations.
 Must be run from the gm-expected directory.  If run from a git or SVN
 checkout, the files will be added to the staging area for commit.
+
+TODO(epoger): Fix indentation in this file (2-space indents, not 4-space).
 '''
 
 # System-level imports
 import argparse
 import os
 import re
 import sys
 import urllib2
 
 # Imports from local directory
@@ skipping 115 matching lines @@
                  actuals_base_url, actuals_filename, exception_handler,
                  tests=None, configs=None, add_new=False):
         self._expectations_root = expectations_root
         self._expectations_filename = expectations_filename
         self._tests = tests
         self._configs = configs
         self._actuals_base_url = actuals_base_url
         self._actuals_filename = actuals_filename
         self._exception_handler = exception_handler
         self._add_new = add_new
-        self._testname_pattern = re.compile('(\S+)_(\S+).png')
+        self._image_filename_re = re.compile(gm_json.IMAGE_FILENAME_PATTERN)
 
     # Returns the full contents of filepath, as a single string.
     # If filepath looks like a URL, try to read it that way instead of as
     # a path on local storage.
     #
     # Raises _InternalException if there is a problem.
     def _GetFileContents(self, filepath):
         if filepath.startswith('http:') or filepath.startswith('https:'):
             try:
                 return urllib2.urlopen(filepath).read()
@@ skipping 63 matching lines @@
         # Read in current expectations.
         expectations_json_filepath = os.path.join(
             self._expectations_root, subdir, self._expectations_filename)
         expectations_dict = gm_json.LoadFromFile(expectations_json_filepath)
 
         # Update the expectations in memory, skipping any tests/configs that
         # the caller asked to exclude.
         skipped_images = []
         if results_to_update:
             for (image_name, image_results) in results_to_update.iteritems():
-                (test, config) = self._testname_pattern.match(image_name).groups()
+                (test, config) = \
+                    self._image_filename_re.match(image_name).groups()
                 if self._tests:
                     if test not in self._tests:
                         skipped_images.append(image_name)
                         continue
                 if self._configs:
                     if config not in self._configs:
                         skipped_images.append(image_name)
                         continue
-                expectations_dict[gm_json.JSONKEY_EXPECTEDRESULTS] \
-                                 [image_name] \
-                                 [gm_json.JSONKEY_EXPECTEDRESULTS_ALLOWEDDIGESTS] = \
-                                     [image_results]
+                expectations_dict \
+                    [gm_json.JSONKEY_EXPECTEDRESULTS] \
+                    [image_name] \
+                    [gm_json.JSONKEY_EXPECTEDRESULTS_ALLOWEDDIGESTS] = \
+                        [image_results]
 
         # Write out updated expectations.
         gm_json.WriteToFile(expectations_dict, expectations_json_filepath)
 
 
 # main...
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--actuals-base-url',
                     help='base URL from which to read files containing JSON ' +
@@ skipping 96 matching lines @@
             exception_handler=exception_handler,
             add_new=args.add_new,
             missing_json_is_fatal=missing_json_is_fatal)
 
     try:
         rebaseliner.RebaselineSubdir(subdir=subdir, builder=builder)
     except BaseException as e:
         exception_handler.RaiseExceptionOrContinue(e)
 
 exception_handler.ReportAllFailures()