Updated all page sets to capture new set of webpage archives

tools/skp/webpages_playback.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Archives or replays webpages and creates SKPs in a Google Storage location.
 
 To archive webpages and store SKP files (archives should be rarely updated):
 
 cd ../buildbot/slave/skia_slave_scripts
@@ skipping 62 matching lines @@
     os.path.abspath(os.path.dirname(__file__)), 'page_sets', 'data')
 TMP_SKP_DIR = tempfile.mkdtemp()
 
 # Location of the credentials.json file and the string that represents missing
 # passwords.
 CREDENTIALS_FILE_PATH = os.path.join(
     os.path.abspath(os.path.dirname(__file__)), 'page_sets', 'data',
     'credentials.json'
 )
 
-# Stdout that signifies that a recording has failed.
-RECORD_FAILURE_MSG = 'The recording has not been updated for these pages.'
-
 # Name of the SKP benchmark
 SKP_BENCHMARK = 'skpicture_printer'
 
 # The max base name length of Skp files.
 MAX_SKP_BASE_NAME_LEN = 31
 
 # Dictionary of device to platform prefixes for SKP files.
 DEVICE_TO_PLATFORM_PREFIX = {
     'desktop': 'desk',
     'galaxynexus': 'mobi',
@@ skipping 118 matching lines @@
           'PYTHONPATH=%s:$PYTHONPATH' % page_set_dir,
           'DISPLAY=%s' % X11_DISPLAY,
           os.path.join(self._telemetry_binaries_dir, 'record_wpr'),
           '--extra-browser-args=--disable-setuid-sandbox',
           '--browser=exact',
           '--browser-executable=%s' % self._browser_executable,
           '%s_page_set' % page_set_basename,
           '--page-set-base-dir=%s' % page_set_dir
         )
         for _ in range(RETRY_RECORD_WPR_COUNT):
-          output = shell_utils.run(' '.join(record_wpr_cmd), shell=True)
-          if RECORD_FAILURE_MSG in output:
-            print output
-          else:
+          try:
+            shell_utils.run(' '.join(record_wpr_cmd), shell=True)
             # Break out of the retry loop since there were no errors.
             break
+          except Exception:
+            # There was a failure continue with the loop.
+            traceback.print_exc()
         else:
           # If we get here then record_wpr did not succeed and thus did not
           # break out of the loop.
           raise Exception('record_wpr failed for page_set: %s' % page_set)
 
       else:
         if not self._skip_all_gs_access:
           # Get the webpages archive so that it can be replayed.
           self._DownloadWebpagesArchive(wpr_data_file, page_set_json_name)
 
@@ skipping 56 matching lines @@
           '-r', self._local_skp_dir
       ]
       render_pdfs_cmd = [
           os.path.join(self._skia_tools, 'render_pdfs'),
           self._local_skp_dir
       ]
 
       for tools_cmd in (render_pictures_cmd, render_pdfs_cmd):
         print '\n\n=======Running %s=======' % ' '.join(tools_cmd)
         proc = subprocess.Popen(tools_cmd)
-        (code, output) = shell_utils.log_process_after_completion(proc,
-                                                                  echo=False)
+        (code, _) = shell_utils.log_process_after_completion(proc, echo=False)
         if code != 0:
           raise Exception('%s failed!' % ' '.join(tools_cmd))
 
       if not self._non_interactive:
         print '\n\n=======Running debugger======='
         os.system('%s %s' % (os.path.join(self._skia_tools, 'debugger'),
                              os.path.join(self._local_skp_dir, '*')))
 
     print '\n\n'
 
@@ skipping 134 matching lines @@
       default=None)
   option_parser.add_option(
       '', '--non-interactive', action='store_true',
       help='Runs the script without any prompts. If this flag is specified and '
            '--skia_tools is specified then the debugger is not run.',
       default=False)
   options, unused_args = option_parser.parse_args()
 
   playback = SkPicturePlayback(options)
   sys.exit(playback.Run())