There's likely never going to be another subclass of MultiCommandTool; merging this class and its only subclass will simplify the code. Some context in https://codereview.chromium.org/2073893004/.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/cb0ae443eb2805ad5ec09ff10f6488798d8ca421 commit cb0ae443eb2805ad5ec09ff10f6488798d8ca421 Author: qyearsley <qyearsley@chromium.org> Date: Sat Jul 02 18:42:58 2016 Merge webkit_patch and multi_command_tool. Since there is only one sub-class for MultiCommandTool, and we don't plan on adding any more, removing MultiCommandTool simplifies the code and makes it clearer that there's no more multi-command tools besides webkit-patch. This CL also updates the test accordingly -- some of the test methods in multi_command_tool_unittest.py are not relevant if there's no general MultiCommandTool superclass, so some test methods were removed. BUG= 621181 Review-Url: https://codereview.chromium.org/2110893003 Cr-Commit-Position: refs/heads/master@{#403615} [modify] https://crrev.com/cb0ae443eb2805ad5ec09ff10f6488798d8ca421/third_party/WebKit/Tools/Scripts/webkit-patch [delete] https://crrev.com/b0c5ab03643d15a7388ff214226df35a5d125f55/third_party/WebKit/Tools/Scripts/webkitpy/tool/multi_command_tool.py [delete] https://crrev.com/b0c5ab03643d15a7388ff214226df35a5d125f55/third_party/WebKit/Tools/Scripts/webkitpy/tool/multi_command_tool_unittest.py [modify] https://crrev.com/cb0ae443eb2805ad5ec09ff10f6488798d8ca421/third_party/WebKit/Tools/Scripts/webkitpy/tool/webkit_patch.py [add] https://crrev.com/cb0ae443eb2805ad5ec09ff10f6488798d8ca421/third_party/WebKit/Tools/Scripts/webkitpy/tool/webkit_patch_unittest.py
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/2d234ea5f6eab8653bfb256408776a0fa4a8af3b commit 2d234ea5f6eab8653bfb256408776a0fa4a8af3b Author: qyearsley <qyearsley@chromium.org> Date: Tue Jul 12 00:09:35 2016 Re-add the path() method of WebKitPatch. The path() method was removed in http://crrev.com/2110893003 because I thought it was unnecessary; it turns out it's used by rebaseline commands to construct the command used to invoke other commands. BUG= 621181 Review-Url: https://codereview.chromium.org/2137013004 Cr-Commit-Position: refs/heads/master@{#404747} [modify] https://crrev.com/2d234ea5f6eab8653bfb256408776a0fa4a8af3b/third_party/WebKit/Tools/Scripts/webkit-patch [modify] https://crrev.com/2d234ea5f6eab8653bfb256408776a0fa4a8af3b/third_party/WebKit/Tools/Scripts/webkitpy/tool/webkit_patch.py [modify] https://crrev.com/2d234ea5f6eab8653bfb256408776a0fa4a8af3b/third_party/WebKit/Tools/Scripts/webkitpy/tool/webkit_patch_unittest.py
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/a2414e189b421e4a8f2998bee6ce3231e432eb21 commit a2414e189b421e4a8f2998bee6ce3231e432eb21 Author: qyearsley <qyearsley@chromium.org> Date: Mon Jul 25 23:39:05 2016 Rename MockTool -> MockWebKitPatch. Now that webkit_patch and multi_command_tool are merged, ( http://crbug.com/621181 ) it may be confusing that the mock version of WebKitPatch is called MockTool. This renaming also resolves a FIXME comment. BUG= 621181 Review-Url: https://codereview.chromium.org/2127343003 Cr-Commit-Position: refs/heads/master@{#407634} [modify] https://crrev.com/a2414e189b421e4a8f2998bee6ce3231e432eb21/third_party/WebKit/Tools/Scripts/webkitpy/tool/bot/commit_announcer_unittest.py [modify] https://crrev.com/a2414e189b421e4a8f2998bee6ce3231e432eb21/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/command_test.py [modify] https://crrev.com/a2414e189b421e4a8f2998bee6ce3231e432eb21/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/flaky_tests_unittest.py [modify] https://crrev.com/a2414e189b421e4a8f2998bee6ce3231e432eb21/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py [modify] https://crrev.com/a2414e189b421e4a8f2998bee6ce3231e432eb21/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py [modify] https://crrev.com/a2414e189b421e4a8f2998bee6ce3231e432eb21/third_party/WebKit/Tools/Scripts/webkitpy/tool/mock_tool.py
Comment 1 by bugdroid1@chromium.org
, Jul 2 2016