Use LocalWPT.test_patch when filtering exportable commits

third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.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 unittest
 
 from webkitpy.common.host_mock import MockHost
 from webkitpy.common.system.executive_mock import MockExecutive2
 from webkitpy.w3c.chromium_commit import ChromiumCommit
 from webkitpy.w3c.test_exporter import TestExporter
 from webkitpy.w3c.wpt_github_mock import MockWPTGitHub
 
 
 def mock_command_exec(vals):
     def run_fn(args):
         sub_command = args[1]
         return vals.get(sub_command, '')
     return MockExecutive2(run_command_fn=run_fn)
 
 
-
 class TestExporterTest(unittest.TestCase):
 
     def setUp(self):
         self.host = MockHost()
         self.wpt_github = MockWPTGitHub(pull_requests=[])
 
     def test_stops_if_more_than_one_pr_is_in_flight(self):
         host = MockHost()
         wpt_github = MockWPTGitHub(pull_requests=[{'id': 1}, {'id': 2}])
 
@@ skipping 32 matching lines @@
             git_command = args[1]
             if git_command == 'rev-list':
                 return 'facebeef\ncafedad5'
             elif git_command == 'footers':
                 return 'fake-cr-position'
             elif git_command == 'show':
                 if 'cafedad5' in args:
                     return 'newer fake text'
                 elif 'facebeef' in args:
                     return 'older fake text'
+            elif git_command == 'remote':
+                return 'github'
+            elif git_command == 'format-patch':
+                return 'fake patch'
+            elif git_command == 'diff':
+                return 'fake patch diff'
+            elif git_command == 'diff-tree':
+                return 'fake\nfiles\nchanged'
             else:
                 return ''

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

This is definitely fine, although doing something using a dict like the other
methods would also work, with a bit of tweaking, e.g.:

        canned_git_outputs = {
            'show': 'newer fake text' if 'cafedad5' in args else 'older fake
text',
            'rev-list': 'facebeef\ncafedad5',
            'footers': 'fake-cr-position',
            'remote': 'github',
            'format-patch': 'fake patch',
            'diff': 'fake patch diff',
            'diff-tree': 'fake\n\files\nchanged',
        }
        return canned_git_outputs.get(git_command, '')

 
         host.executive = MockExecutive2(run_command_fn=mock_command)
         wpt_github = MockWPTGitHub(pull_requests=[])
 
         TestExporter(host, wpt_github).run()
 
         self.assertEqual(wpt_github.calls, ['in_flight_pull_requests', 'create_pr'])
         self.assertEqual(wpt_github.pull_requests_created,
                          [('chromium-export-try', 'older fake text', 'older fake text')])
 
@@ skipping 61 matching lines @@
         })
         wpt_github = MockWPTGitHub(pull_requests=[])
         test_exporter = TestExporter(self.host, wpt_github)
 
         commits = test_exporter.exportable_commits_since('beefcafe')
         self.assertEqual(len(commits), 0)
         self.assertEqual(self.host.executive.calls, [
             ['git', 'rev-parse', '--show-toplevel'],
             ['git', 'rev-list', 'beefcafe..HEAD', '--reverse', '--', 'badbeef8/third_party/WebKit/LayoutTests/imported/wpt/'],
             ['git', 'show', '--format=%B', '--no-patch', 'badbeef8']])