Import web-platform-tests manual tests by default

third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.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 attempt to
 upload a CL, triggery try jobs, and make any changes that are required for
 new failing tests before committing.
 """
@@ skipping 175 matching lines @@
         for subpath in files_to_delete:
             self.remove('LayoutTests', 'imported', subpath)
 
         self.print_('## Importing the tests.')
         src_repo = self.path_from_webkit_base(dest_dir_name)
         import_path = self.path_from_webkit_base('Tools', 'Scripts', 'import-w3c-tests')
         self.run([self.host.executable, import_path, '-d', 'imported', src_repo])
 
         self.run(['git', 'add', '--all', 'LayoutTests/imported/%s' % dest_dir_name])
 
-        self.print_('## Deleting manual tests.')
-        files_to_delete = self.fs.files_under(dest_path, file_filter=self.is_manual_test)
-        for subpath in files_to_delete:
-            self.remove('LayoutTests', 'imported', subpath)
-
         self.print_('## Deleting any orphaned baselines.')
         previous_baselines = self.fs.files_under(dest_path, file_filter=self.is_baseline)
         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(temp_repo_path, dest_path)
         if not keep_w3c_repos_around:
             self.print_('## Deleting temp repo directory %s.' % temp_repo_path)
@@ skipping 18 matching lines @@
                 self.print_('EOF')
             self.fs.write_text_file(path_to_commit_msg, commit_msg)
             self.run(['git', 'commit', '-a', '-F', path_to_commit_msg])
             self.remove(path_to_commit_msg)
             self.print_('## Done: changes imported and committed.')
             return True
         else:
             self.print_('## Done: no changes to import.')
             return False
 
-    def is_manual_test(self, fs, dirname, basename):
-        """Returns True if the file should be removed because it's a manual test.
-
-        Tests with "-manual" in the name are not considered manual tests
-        if there is a corresponding JS automation file.
-        """
-        basename_without_extension, _ = self.fs.splitext(basename)
-        if not basename_without_extension.endswith('-manual'):
-            return False
-        dir_from_wpt = fs.relpath(dirname, self.path_from_webkit_base('LayoutTests', 'imported', 'wpt'))
-        automation_dir = self.path_from_webkit_base('LayoutTests', 'imported', 'wpt_automation', dir_from_wpt)
-        if fs.isfile(fs.join(automation_dir, '%s-automation.js' % basename_without_extension)):
-            return False
-        return True
-
     # Callback for FileSystem.files_under; not all arguments used - pylint: disable=unused-argument
     def is_baseline(self, fs, dirname, basename):
         return basename.endswith('-expected.txt')
 
     def is_not_baseline(self, fs, dirname, basename):
         return not self.is_baseline(fs, dirname, basename)
 
     def run(self, cmd, exit_on_failure=True, cwd=None):
         if self.verbose:
             self.print_(' '.join(cmd))
@@ skipping 187 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