Use LocalWPT.test_patch when filtering exportable commits

third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt.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.
 
 """A utility class for interacting with a local checkout of the Web Platform Tests."""
 
 import logging
 
+from webkitpy.common.system.executive import ScriptError
 from webkitpy.w3c.chromium_commit import ChromiumCommit
 
 WPT_REPO_URL = 'https://chromium.googlesource.com/external/w3c/web-platform-tests.git'
 WPT_TMP_DIR = '/tmp/wpt'
 CHROMIUM_WPT_DIR = 'third_party/WebKit/LayoutTests/imported/wpt/'
 
 _log = logging.getLogger(__name__)
 
 
 class LocalWPT(object):
@@ skipping 81 matching lines @@
         patch = patch.replace(CHROMIUM_WPT_DIR, '')
 
         # TODO(jeffcarp): Use git am -p<n> where n is len(CHROMIUM_WPT_DIR.split(/'))
         # or something not off-by-one.
         self.run(['git', 'apply', '-'], input=patch)
         self.run(['git', 'commit', '-am', message])
         self.run(['git', 'push', 'github', branch_name])
 
         return branch_name
 
+    def test_patch(self, patch):
+        """Returns the expected output of a patch agains origin/master.

[qyearsley, 2016/12/22 22:04:54]

Nit: agains -> against

+
+        Args:
+            patch: The patch to test against.
+
+        Returns:
+            A string containing the diff the patch produced.

[qyearsley, 2016/12/22 22:04:54]

Sometimes I'm confused about the words "diff" and "patch".

Sometimes a patch is a diff and a diff is a patch (i.e. the output of `git diff`
or `diff`), but there are different types of diffs and patch can sometimes mean
other things.

Even if this method isn't very testable because it because involves interacting
with external systems (the filesystem and git subprocesses), it might be nice to
see a simple example input and output.

Also: I'm not sure if it's a good idea, but in scm_unittest.py, it actually
creates a real git repo in a temp dir to do testing (see:
https://codereview.chromium.org/2594513003). That kind of test may also be
possible for some methods of LocalWPT?

[jeffcarp, 2016/12/22 23:14:29]

Hm what do you suggest re: diff/patch?

That sounds like a good idea but I'd like to do that after I transfer things to
webkitpy.common.checkout.git.Git. I can make a bug for it.

[qyearsley, 2016/12/22 23:19:53]

I was wondering if you could put an example (very short) input and output that
this might produce, depending on the state of origin/master -- if the files in
WPT at origin/master is the same as Chromium was before the Chromium CL, then
the input and output would be very similar, right?

But then if WPT has been updated since the time when the Chromium CL was made,
then there may or may not be a conflict, and if there's no conflict, the output
diff might be different from the input diff?

+        """
+        self.clean()
+
+        # Remove Chromium WPT directory prefix.
+        # TODO(jeffcarp): dedupe

[qyearsley, 2016/12/22 22:04:54]

Dedupe what?

[jeffcarp, 2016/12/22 23:14:29]

Oops it was already deduped.

+        patch = patch.replace(CHROMIUM_WPT_DIR, '')
+
+        try:
+            self.run(['git', 'apply', '-'], input=patch)
+            self.run(['git', 'add', '.'])
+            output = self.run(['git', 'diff', 'origin/master'])
+        except ScriptError as error:
+            _log.error('Error while applying patch: %s', error)
+            output = ''
+
+        self.clean()
+        return output
+
     def commits_behind_master(self, commit):
         """Returns the number of commits after the given commit on origin/master.
 
         This doesn't include the given commit, and this assumes that the given
         commit is on the the master branch.
         """
         return len(self.run([
             'git', 'rev-list', '{}..origin/master'.format(commit)
         ]).splitlines())