Merge ChromiumWPT functionality into TestExporter, use ChromiumCommits

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

 # Copyright 2016 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.
 
 import logging
 from webkitpy.w3c.local_wpt import LocalWPT
-from webkitpy.w3c.chromium_wpt import ChromiumWPT
 from webkitpy.w3c.chromium_commit import ChromiumCommit
+from webkitpy.w3c.deps_updater import DepsUpdater
 
 _log = logging.getLogger(__name__)
+CHROMIUM_WPT_DIR = 'third_party/WebKit/LayoutTests/imported/wpt/'

[qyearsley, 2016/12/16 00:45:17]

Nit: Optional: Could add a blank line after `import logging` and after `_log =
...`.

 
 
 class TestExporter(object):
 
     def __init__(self, host, wpt_github, dry_run=False):
         self.host = host
         self.wpt_github = wpt_github
         self.dry_run = dry_run
 
     def run(self):
@@ skipping 16 matching lines @@
                 _log.info('PR merged!')
         elif len(pull_requests) > 1:
             _log.error(pull_requests)
             # TODO(jeffcarp): Print links to PRs
             raise Exception('More than two in-flight PRs!')
 
         # Second, look for exportable commits in Chromium
         # At this point, no in-flight PRs should exist
         # If there was an issue merging, it should have errored out
         local_wpt = LocalWPT(self.host, use_github=False)
-        chromium_wpt = ChromiumWPT(self.host)
 
         # TODO(jeffcarp): have the script running this fetch Chromium origin/master
         # TODO(jeffcarp): move WPT fetch out of its constructor to match planned ChromiumWPT pattern
 
         wpt_commit, chromium_commit = local_wpt.most_recent_chromium_commit()
         assert chromium_commit, 'No Chromium commit found, this is impossible'
 
         wpt_behind_master = local_wpt.commits_behind_master(wpt_commit)
 
         _log.info('\nLast Chromium export commit in web-platform-tests:')
         _log.info('web-platform-tests@%s', wpt_commit)
         _log.info('(%d behind web-platform-tests@origin/master)', wpt_behind_master)
 
         _log.info('\nThe above WPT commit points to the following Chromium commit:')
         _log.info('chromium@%s', chromium_commit.sha)
         _log.info('(%d behind chromium@origin/master)', chromium_commit.num_behind_master())
 
-        # TODO(jeffcarp): Have this function return ChromiumCommits
-        exportable_commits = chromium_wpt.exportable_commits_since(chromium_commit.sha)
+        exportable_commits = self.exportable_commits_since(chromium_commit.sha)
 
         if not exportable_commits:
             _log.info('No exportable commits found in Chromium, stopping.')
             return
 
         _log.info('Found %d exportable commits in Chromium:', len(exportable_commits))
         for commit in exportable_commits:
-            _log.info('- %s %s', commit, chromium_wpt.subject(commit))
+            _log.info('- %s %s', commit, commit.subject())
 
-        outbound_commit = ChromiumCommit(self.host, sha=exportable_commits[0])
+        outbound_commit = exportable_commits[0]
         _log.info('Picking the earliest commit and creating a PR')
         _log.info('- %s %s', outbound_commit.sha, outbound_commit.subject())
 
         patch = outbound_commit.format_patch()
         message = outbound_commit.message()
 
         # TODO: now do a test comparison of patch against local WPT
 
         if self.dry_run:
             _log.info('[dry_run] Stopping before creating PR')
             _log.info('\n\n[dry_run] message:')
             _log.info(message)
             _log.info('\n\n[dry_run] patch:')
             _log.info(patch)
             return
 
         local_branch_name = local_wpt.create_branch_with_patch(message, patch)
 
         response_data = self.wpt_github.create_pr(
             local_branch_name=local_branch_name,
             desc_title=outbound_commit.subject(),
             body=outbound_commit.body())
 
         _log.info('Create PR response: %s', response_data)
+
+    def exportable_commits_since(self, commit):
+        """Returns SHAs of exportable commits since `commit` in chronological order.
+
+        Args:
+            commit: The SHA of the Chromium commit from which this method will look.
+        """
+        toplevel = self.host.executive.run_command([

[qyearsley, 2016/12/16 00:45:17]

toplevel is the repo root, right? Is this necessary here? Is there a better
name?

[jeffcarp, 2016/12/16 20:07:10]

Yep, I can rename it to repo_root. Is there a cleaner way to achieve this?

+            'git', 'rev-parse', '--show-toplevel'
+        ]).strip()
+
+        commits = self.host.executive.run_command([
+            'git', 'rev-list', '{}..HEAD'.format(commit), '--reverse',
+            '--', toplevel + '/' + CHROMIUM_WPT_DIR
+        ]).splitlines()
+
+        chromium_commits = [ChromiumCommit(self.host, sha=c) for c in commits]
+
+        def is_exportable(chromium_commit):
+            message = chromium_commit.message()
+            return (
+                'NOEXPORT=true' not in message
+                and not message.startswith('Import ')
+                # TODO(jeffcarp): change this to allow any commit with
+                #   any non-expectation changes to be exportable
+                and not self._has_expectations(chromium_commit)
+            )

[qyearsley, 2016/12/16 00:45:17]

Doesn't make much of a difference here, but this could also be made a
class-level (non-nested) method _is_exportable. Optionally it could be a static
method.

[jeffcarp, 2016/12/16 20:07:10]

It seemed cleaner to have it in here because it's only used within this method,
but now that you bring it up a static is_exportable method might be useful to
other modules too.

This method will change a bit in later CLs, can we revisit this after those?

+
+        return filter(is_exportable, chromium_commits)
+
+    def _has_expectations(self, chromium_commit):
+        files = self.host.executive.run_command([
+            'git', 'diff-tree', '--no-commit-id',
+            '--name-only', '-r', chromium_commit.sha
+        ]).splitlines()
+
+        return any(DepsUpdater.is_baseline(f) for f in files)