webpages_playback.py: Avoid crash when retrying to capture skp

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 skia
@@ skipping 215 matching lines @@
           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):
           try:
             shell_utils.run(' '.join(record_wpr_cmd), shell=True)
+
+            # Move over the created archive into the local webpages archive
+            # directory.
+            shutil.move(
+              os.path.join(LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR, wpr_data_file),
+              self._local_record_webpages_archive_dir)
+            shutil.move(
+              os.path.join(LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR,
+                           page_set_json_name),
+              self._local_record_webpages_archive_dir)
+
             # 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)
 
@@ skipping 18 matching lines @@
 
       for _ in range(RETRY_RUN_MEASUREMENT_COUNT):
         try:
           print '\n\n=======Capturing SKP of %s=======\n\n' % page_set
           shell_utils.run(' '.join(run_benchmark_cmd), shell=True)
         except shell_utils.CommandFailedException:
           # skpicture_printer sometimes fails with AssertionError but the
           # captured SKP is still valid. This is a known issue.
           pass
 
-        if self._record:
-          # Move over the created archive into the local webpages archive
-          # directory.
-          shutil.move(
-              os.path.join(LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR, wpr_data_file),
-              self._local_record_webpages_archive_dir)
-          shutil.move(
-              os.path.join(LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR,
-                           page_set_json_name),
-              self._local_record_webpages_archive_dir)
-
         # Rename generated SKP files into more descriptive names.
         try:
           self._RenameSkpFiles(page_set)
           # 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()
           print '\n\n=======Retrying %s=======\n\n' % page_set
           time.sleep(10)
@@ skipping 216 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())