Ignore OWNERS files during external/wpt import and export

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 215 matching lines @@
         if revision is not None:
             _log.info('Checking out %s', revision)
             self.run(['git', 'checkout', revision], cwd=temp_repo_path)
 
         self.run(['git', 'submodule', 'update', '--init', '--recursive'], cwd=temp_repo_path)
 
         _log.info('Noting the revision we are importing.')
         _, show_ref_output = self.run(['git', 'show-ref', 'origin/master'], cwd=temp_repo_path)
         master_commitish = show_ref_output.split()[0]
 
-        _log.info('Cleaning out tests from LayoutTests/external/%s.', dest_dir_name)
         dest_path = self.path_from_webkit_base('LayoutTests', 'external', dest_dir_name)
-        is_not_baseline_filter = lambda fs, dirname, basename: not self.is_baseline(basename)
-        files_to_delete = self.fs.files_under(dest_path, file_filter=is_not_baseline_filter)
-        for subpath in files_to_delete:
-            self.remove('LayoutTests', 'external', subpath)
+        self._clear_out_dest_path(dest_path)
 
         _log.info('Importing the tests.')
         test_copier = TestCopier(self.host, temp_repo_path)
         test_copier.do_import()
 
         self.run(['git', 'add', '--all', 'LayoutTests/external/%s' % dest_dir_name])
 
         self._delete_orphaned_baselines(dest_path)
 
         self._generate_manifest(dest_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 _clear_out_dest_path(self, dest_path):
+        _log.info('Cleaning out tests from %s.', dest_path)
+        should_remove = lambda fs, dirname, basename: (
+            not self.is_baseline(basename) and
+            # See http://crbug.com/702283 for context.
+            basename != 'OWNERS')
+        files_to_delete = self.fs.files_under(dest_path, file_filter=should_remove)
+        for subpath in files_to_delete:
+            self.remove('LayoutTests', 'external', subpath)
+
     def _commit_changes(self, commit_message):
         _log.info('Committing changes.')
         self.run(['git', 'commit', '--all', '-F', '-'], stdin=commit_message)
 
     def _has_changes(self):
         return_code, _ = self.run(['git', 'diff', '--quiet', 'HEAD'], exit_on_failure=False)
         return return_code == 1
 
     def _commit_message(self, chromium_commit, import_commit):
         return ('Import %s\n\n'
@@ skipping 219 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