[WPT Export] Include commit details when skipping commit

Also reduce verbosity by automatically skipping import commits

BUG=
R=qyearsley@chromium.org

Review-Url: https://codereview.chromium.org/2664583002
Cr-Commit-Position: refs/heads/master@{#446861}

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

@@ -49,7 +49,7 @@ def exportable_commits_since(chromium_commit_hash, host, local_wpt):
 def is_exportable(chromium_commit, local_wpt):
     """Checks whether a given patch is exportable and can be applied."""
     patch = chromium_commit.format_patch()
-    return (patch and
-            local_wpt.test_patch(patch) and
-            'NOEXPORT=true' not in chromium_commit.message() and
-            not chromium_commit.message().startswith('Import '))
+    return ('NOEXPORT=true' not in chromium_commit.message() and
+            not chromium_commit.message().startswith('Import ') and
+            patch and
+            local_wpt.test_patch(patch, chromium_commit))

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

@@ -20,8 +20,8 @@ def run_fn(args):
 
 class MockLocalWPT(object):
 
-    def test_patch(self, _):
-        return True
+    def test_patch(self, patch, chromium_commit):  # pylint: disable=unused-argument
+        return 'patch'
 
 
 class CommonTest(unittest.TestCase):
@@ -68,7 +68,8 @@ def test_ignores_commits_with_noexport_true(self):
             ['git', 'rev-list', 'beefcafe..HEAD', '--reverse', '--',
              'badbeef8/third_party/WebKit/LayoutTests/external/wpt/'],
             ['git', 'diff-tree', '--name-only', '--no-commit-id', '-r', 'badbeef8', '--',
-             '/mock-checkout/third_party/WebKit/LayoutTests/external/wpt']
+             '/mock-checkout/third_party/WebKit/LayoutTests/external/wpt'],
+            ['git', 'show', '--format=%B', '--no-patch', 'badbeef8']
         ])
 
     def test_ignores_reverted_commits_with_noexport_true(self):
@@ -87,7 +88,9 @@ def test_ignores_reverted_commits_with_noexport_true(self):
             ['git', 'rev-list', 'beefcafe..HEAD', '--reverse', '--',
              'badbeef8/third_party/WebKit/LayoutTests/external/wpt/'],
             ['git', 'diff-tree', '--name-only', '--no-commit-id', '-r', 'badbeef8', '--',
-             '/mock-checkout/third_party/WebKit/LayoutTests/external/wpt']])
+             '/mock-checkout/third_party/WebKit/LayoutTests/external/wpt'],
+            ['git', 'show', '--format=%B', '--no-patch', 'badbeef8']
+        ])
 
     def test_ignores_commits_that_start_with_import(self):
         host = MockHost()
@@ -105,5 +108,7 @@ def test_ignores_commits_that_start_with_import(self):
             ['git', 'rev-list', 'beefcafe..HEAD', '--reverse', '--',
              'badbeef8/third_party/WebKit/LayoutTests/external/wpt/'],
             ['git', 'diff-tree', '--name-only', '--no-commit-id', '-r', 'badbeef8', '--',
-             '/mock-checkout/third_party/WebKit/LayoutTests/external/wpt']
+             '/mock-checkout/third_party/WebKit/LayoutTests/external/wpt'],
+            ['git', 'show', '--format=%B', '--no-patch', 'badbeef8'],
+            ['git', 'show', '--format=%B', '--no-patch', 'badbeef8'],
         ])

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

@@ -101,7 +101,7 @@ def create_branch_with_patch(self, message, patch, author):
 
         return self.branch_name
 
-    def test_patch(self, patch):
+    def test_patch(self, patch, chromium_commit=None):
         """Returns the expected output of a patch against origin/master.
 
         Args:
@@ -120,7 +120,10 @@ def test_patch(self, patch):
             self.run(['git', 'add', '.'])
             output = self.run(['git', 'diff', 'origin/master'])
         except ScriptError:
-            _log.warning('Patch did not apply cleanly, skipping...')
+            _log.warning('Patch did not apply cleanly, skipping.')
+            if chromium_commit:
+                _log.warning('Commit details:\n%s\n%s', chromium_commit.sha,
+                             chromium_commit.subject())
             output = ''
 
         self.clean()