Change DepsUpdater.is_manual_test to check wpt_automation directory.

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.
 
 """Pull latest revisions of a W3C test repo and make a local commit."""
 
 import argparse
 import time
 
 from webkitpy.common.webkit_finder import WebKitFinder
@@ skipping 173 matching lines @@
                 self.print_('cat > %s <<EOF' % path_to_commit_msg)
                 self.print_(commit_msg)
                 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.')
         else:
             self.print_('## Done: no changes to import.')
 
-    def is_manual_test(self, fs, dirname, basename):  # Callback for FileSystem.files_under; not all arguments used - pylint: disable=unused-argument
-        # We are importing manual pointer event tests and we are automating them.
-        return ("pointerevents" not in dirname) and (basename.endswith('-manual.html') or basename.endswith('-manual.htm'))
+    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, _ = basename.rsplit('.', 1)
+        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)
+        # TODO(qyearsley): Update this when all *-input.js are renamed to *-automation.js.
+        if fs.isfile(fs.join(automation_dir, '%s-input.js' % basename_without_extension)):
+            return False
+        if fs.isfile(fs.join(automation_dir, '%s-automation.js' % basename_without_extension)):
+            return False
+        return True
 
     def is_baseline(self, fs, dirname, basename):  # Callback for FileSystem.files_under; not all arguments used - pylint: disable=unused-argument
         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 66 matching lines @@
         sets['Failures'] -= sets['Successes']
         sets['Started'] -= sets['Successes']
         sets['Started'] -= sets['Failures']
         return sets
 
     def check_run(self, command):
         return_code, out = self.run(command)
         if return_code:
             raise Exception('%s failed with exit code %d.' % ' '.join(command), return_code)
         return out