rebaseline.py: skip any platforms we don't have actual results for, with warning message

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.
 '''
 
 '''
@@ skipping 53 matching lines @@
     'Test-Android-NexusS-SGX540-Arm7-Release',
    'base-android-xoom':
     'Test-Android-Xoom-Tegra2-Arm7-Release',
    'base-android-nexus-10':
     'Test-Android-Nexus10-MaliT604-Arm7-Release',
    'base-android-nexus-4':
     'Test-Android-Nexus4-Adreno320-Arm7-Release',
 }
 
 
-class CommandFailedException(Exception):
+class _InternalException(Exception):
     pass
 
 # Object that rebaselines a JSON expectations file (not individual image files).
 class JsonRebaseliner(object):
 
     # params:
     #  expectations_root: root directory of all expectations JSON files
     #  expectations_filename: filename (under expectations_root) of JSON
     #                         expectations file; typically
     #                         "expected-results.json"
@@ skipping 14 matching lines @@
         self._tests = tests
         self._configs = configs
         self._actuals_base_url = actuals_base_url
         self._actuals_filename = actuals_filename
         self._add_new = add_new
         self._testname_pattern = re.compile('(\S+)_(\S+).png')
 
     # 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:'):
-            return urllib2.urlopen(filepath).read()
+            try:
+                return urllib2.urlopen(filepath).read()
+            except urllib2.HTTPError as e:
+                raise _InternalException('unable to read URL %s: %s' % (
+                    filepath, e))
         else:
             return open(filepath, 'r').read()
 
     # Returns a dictionary of actual results from actual-results.json file.
     #
     # The dictionary returned has this format:
     # {
     #  u'imageblur_565.png': [u'bitmap-64bitMD5', 3359963596899141322],
     #  u'imageblur_8888.png': [u'bitmap-64bitMD5', 4217923806027861152],
     #  u'shadertext3_8888.png': [u'bitmap-64bitMD5', 3713708307125704716]
     # }
     #
-    # If the JSON actual result summary file cannot be loaded, raise an
-    # exception.
+    # If the JSON actual result summary file cannot be loaded, logs a warning
+    # message and returns None.
+    # If the JSON actual result summary file can be loaded, but we have
+    # trouble parsing it, raises an Exception.
     #
     # params:
     #  json_url: URL pointing to a JSON actual result summary file
     #  sections: a list of section names to include in the results, e.g.
     #            [gm_json.JSONKEY_ACTUALRESULTS_FAILED,
     #             gm_json.JSONKEY_ACTUALRESULTS_NOCOMPARISON] ;
     #            if None, then include ALL sections.
     def _GetActualResults(self, json_url, sections=None):
-        json_contents = self._GetFileContents(json_url)
+        try:
+            json_contents = self._GetFileContents(json_url)
+        except _InternalException:
+            print >> sys.stderr, (
+                'could not read json_url %s ; skipping this platform.' %
+                json_url)
+            return None
         json_dict = gm_json.LoadFromString(json_contents)
         results_to_return = {}
         actual_results = json_dict[gm_json.JSONKEY_ACTUALRESULTS]
         if not sections:
             sections = actual_results.keys()
         for section in sections:
             section_results = actual_results[section]
             if section_results:
                 results_to_return.update(section_results)
         return results_to_return
@@ skipping 138 matching lines @@
             dry_run=args.dry_run,
             json_base_url=args.actuals_base_url,
             json_filename=args.actuals_filename,
             add_new=args.add_new,
             missing_json_is_fatal=missing_json_is_fatal)
     try:
         rebaseliner.RebaselineSubdir(subdir=subdir, builder=builder)
     except BaseException as e:
         print >> sys.stderr, e
         sys.exit(1)