Refactoring: Extract a method _copy_resources_to_wpt in deps_updater.py.

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 json
 import time
 
@@ skipping 27 matching lines @@
             return 1
 
         self.print_('## Noting the current Chromium commit.')
         _, show_ref_output = self.run(['git', 'show-ref', 'HEAD'])
         chromium_commitish = show_ref_output.split()[0]
 
         if self.target == 'wpt':
             import_commitish = self.update(
                 WPT_DEST_NAME,
                 'https://chromium.googlesource.com/external/w3c/web-platform-tests.git')
-
-            for resource in ['testharnessreport.js', 'WebIDLParser.js']:
-                source = self.path_from_webkit_base('LayoutTests', 'resources', resource)
-                destination = self.path_from_webkit_base('LayoutTests', 'imported', WPT_DEST_NAME, 'resources', resource)
-                self.copyfile(source, destination)
-                self.run(['git', 'add', destination])
-            for resource in ['vendor-prefix.js']:
-                source = self.path_from_webkit_base('LayoutTests', 'resources', resource)
-                destination = self.path_from_webkit_base('LayoutTests', 'imported', WPT_DEST_NAME, 'common', resource)
-                self.copyfile(source, destination)
-                self.run(['git', 'add', destination])
-
+            self._copy_resources_to_wpt()
         elif self.target == 'css':
             import_commitish = self.update(
                 CSS_DEST_NAME,
                 'https://chromium.googlesource.com/external/w3c/csswg-test.git')
         else:
             raise AssertionError("Unsupported target %s" % self.target)
 
         has_changes = self.commit_changes_if_needed(chromium_commitish, import_commitish)
         if self.auto_update and has_changes:
             try_bots = self.host.builders.all_try_builder_names()
@@ skipping 55 matching lines @@
         if self.fs.exists(self.path_from_webkit_base(WPT_DEST_NAME)):
             self.print_('## WebKit/%s exists; aborting.' % WPT_DEST_NAME)
             return False
 
         if self.fs.exists(self.path_from_webkit_base(CSS_DEST_NAME)):
             self.print_('## WebKit/%s repo exists; aborting.' % CSS_DEST_NAME)
             return False
 
         return True
 
+    def _copy_resources_to_wpt(self):
+        """Copies some files over to a newly-updated wpt directory.
+
+        This is necessary because we want to be used when running imported tests

[Dirk Pranke, 2016/08/15 23:40:14]

Nit: what is it that we want to be used? This wording is awkward.

+        which are different than those in the upstream repo.
+        """
+        resources_to_copy = [
+            ('testharnessreport.js', 'resources'),
+            ('WebIDLParser.js', 'resources'),
+            ('vendor-prefix.js', 'common'),
+        ]
+        for filename, wpt_subdir in resources_to_copy:
+            source = self.path_from_webkit_base('LayoutTests', 'resources', filename)
+            destination = self.path_from_webkit_base('LayoutTests', 'imported', WPT_DEST_NAME, wpt_subdir, filename)
+            self.copyfile(source, destination)
+            self.run(['git', 'add', destination])
+
     def update(self, dest_dir_name, url):
         """Updates an imported repository.
 
         Args:
             dest_dir_name: The destination directory name.
             url: URL of the git repository.
 
         Returns:
             A string for the commit description "<destination>@<commitish>".
         """
@@ skipping 217 matching lines @@
     def generate_upload_command(self, email_list):
         message = """W3C auto test importer
 
 TBR=qyearsley@chromium.org"""
 
         command = ['git', 'cl', 'upload', '-f', '-m', message]
         command += ['--cc=' + email for email in email_list]
         if self.auth_refresh_token_json:
             command += ['--auth-refresh-token-json', self.auth_refresh_token_json]
         return command