Use LocalWPT.test_patch when filtering exportable commits

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_commit import ChromiumCommit
-from webkitpy.w3c.deps_updater import DepsUpdater
 
 _log = logging.getLogger(__name__)
-
 CHROMIUM_WPT_DIR = 'third_party/WebKit/LayoutTests/imported/wpt/'
 
 
 class TestExporter(object):
 
     def __init__(self, host, wpt_github, dry_run=False):
         self.host = host
         self.wpt_github = wpt_github
+        self.local_wpt = LocalWPT(self.host)
         self.dry_run = dry_run
 
     def run(self):
         # First, poll for an in-flight pull request and merge if exists
         pull_requests = self.wpt_github.in_flight_pull_requests()
 
         if len(pull_requests) == 1:
             pull_request = pull_requests.pop()
 
             _log.info('In-flight PR found: #%d', pull_request['number'])
             _log.info(pull_request['title'])
 
             # TODO(jeffcarp): Check the PR status here
 
             if self.dry_run:
                 _log.info('[dry_run] Would have attempted to merge PR')
             else:
                 _log.info('Merging...')
                 self.wpt_github.merge_pull_request(pull_request['number'])
                 _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)
 
         # 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()
+        wpt_commit, chromium_commit = self.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)
+        wpt_behind_master = self.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())
 
         exportable_commits = self.exportable_commits_since(chromium_commit.sha)
@@ skipping 16 matching lines @@
         # 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)
+        local_branch_name = self.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.
         """
         repo_root = self.host.executive.run_command([
             'git', 'rev-parse', '--show-toplevel'
         ]).strip()
 
         commits = self.host.executive.run_command([
             'git', 'rev-list', '{}..HEAD'.format(commit), '--reverse',
             '--', repo_root + '/' + CHROMIUM_WPT_DIR
         ]).splitlines()
 
         chromium_commits = [ChromiumCommit(self.host, sha=c) for c in commits]
 
         def is_exportable(chromium_commit):
-            message = chromium_commit.message()
+            patch = chromium_commit.format_patch()
             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)
+                patch
+                and self.local_wpt.test_patch(patch)
+                and 'NOEXPORT=true' not in chromium_commit.message()
+                and not chromium_commit.message().startswith('Import ')
             )
 
-        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)
+        return [c for c in chromium_commits if is_exportable(c)]