W3C test importer: Clean up temp repo after abort.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py

 # Copyright 2014 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.
 
 """Fetches a copy of the latest state of a W3C test repository and commits.
 
 If this script is given the argument --auto-update, it will also:
  1. Upload a CL.
  2. Trigger try jobs and wait for them to complete.
  3. Make any changes that are required for new failing tests.
@@ skipping 64 matching lines @@
         _log.info('Local path: %s', temp_repo_path)
         self.run(['git', 'clone', repo_url, temp_repo_path])
 
         if options.target == 'wpt':
             commits = self.exportable_but_not_exported_commits(temp_repo_path)
             if commits:
                 _log.error('There were exportable but not-yet-exported commits:')
                 for commit in commits:
                     _log.error('  https://chromium.googlesource.com/chromium/src/+/%s', commit.sha)
                 _log.error('Aborting import to prevent clobbering these commits.')
+                if not options.keep_w3c_repos_around:
+                    self.clean_up_temp_repo(temp_repo_path)
                 return 1
 
         import_commit = self.update(dest_dir_name, temp_repo_path, options.keep_w3c_repos_around, options.revision)
 
+        if not options.keep_w3c_repos_around:
+            self.clean_up_temp_repo(temp_repo_path)
+
         if options.target == 'wpt':
             self._copy_resources()
 
         has_changes = self._has_changes()
         if not has_changes:
             _log.info('Done: no changes to import.')
             return 0
 
         commit_message = self._commit_message(chromium_commit, import_commit)
         self._commit_changes(commit_message)
@@ skipping 53 matching lines @@
 
         Returns:
             A list of commits in the Chromium repo that are exportable
             but not yet exported to the web-platform-tests repo.
         """
         local_wpt = LocalWPT(self.host, path=wpt_path)
         assert self.host.filesystem.exists(wpt_path)
         _, chromium_commit = local_wpt.most_recent_chromium_commit()
         return exportable_commits_since(chromium_commit.sha, self.host, local_wpt)
 
+    def clean_up_temp_repo(self, temp_repo_path):
+        _log.info('Deleting temp repo directory %s.', temp_repo_path)
+        self.rmtree(temp_repo_path)
+
     def _copy_resources(self):
         """Copies resources from wpt to LayoutTests/resources.
 
         We copy idlharness.js and testharness.js in wpt to LayoutTests/resources
         in order to use them in non-imported tests.
 
         If this method is changed, the lists of files expected to be identical
         in LayoutTests/PRESUBMIT.py should also be changed.
         """
         resources_to_copy_from_wpt = [
@@ skipping 63 matching lines @@
         is_baseline_filter = lambda fs, dirname, basename: self.is_baseline(basename)
         previous_baselines = self.fs.files_under(dest_path, file_filter=is_baseline_filter)
 
         for subpath in previous_baselines:
             full_path = self.fs.join(dest_path, subpath)
             if self.fs.glob(full_path.replace('-expected.txt', '*')) == [full_path]:
                 self.fs.remove(full_path)
 
         self._generate_manifest(dest_path)
 
-        if not keep_w3c_repos_around:
-            _log.info('Deleting temp repo directory %s.', temp_repo_path)
-            self.rmtree(temp_repo_path)
-
         _log.info('Updating TestExpectations for any removed or renamed tests.')
         self.update_all_test_expectations_files(self._list_deleted_tests(), self._list_renamed_tests())
 
         return '%s@%s' % (dest_dir_name, master_commitish)
 
     def _commit_changes(self, commit_message):
         _log.info('Committing changes.')
         self.run(['git', 'commit', '--all', '-F', '-'], stdin=commit_message)
 
     def _has_changes(self):
@@ skipping 181 matching lines @@
         """Returns a dict mapping source to dest name for layout tests that have been renamed."""
         out = self.check_run(['git', 'diff', 'origin/master', '-M100%', '--diff-filter=R', '--name-status'])
         renamed_tests = {}
         for line in out.splitlines():
             _, source_path, dest_path = line.split()
             source_test = self.finder.layout_test_name(source_path)
             dest_test = self.finder.layout_test_name(dest_path)
             if source_test and dest_test:
                 renamed_tests[source_test] = dest_test
         return renamed_tests