Reland of Use an explicit list of webkit-patch commands instead of using auto-discovery.

third_party/WebKit/Tools/Scripts/webkitpy/tool/multi_command_tool_unittest.py

 # Copyright (c) 2009 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 14 matching lines @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import unittest
 
 from optparse import make_option
 
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.tool.multi_command_tool import MultiCommandTool
-from webkitpy.tool.commands import Command
+from webkitpy.tool.commands.command import Command
 
 
 class TrivialCommand(Command):
     name = "trivial"
     help_text = "help text"
     long_help = "trivial command long help text"
     show_in_main_help = True
 
     def __init__(self, **kwargs):
         super(TrivialCommand, self).__init__(**kwargs)
 
     def execute(self, options, args, tool):
         pass
 
 
 class UncommonCommand(TrivialCommand):
     name = "uncommon"
     show_in_main_help = False
 
 
 class TrivialTool(MultiCommandTool):
 
-    def __init__(self, commands=None):
-        MultiCommandTool.__init__(self, name="trivial-tool", commands=commands)
+    def __init__(self, commands):
+        MultiCommandTool.__init__(self, commands)
+
+    def name(self):
+        return 'trivial-tool'
 
     def path(self):
         return __file__
 
     def should_execute_command(self, command):
         return (True, None)
 
 
 class MultiCommandToolTest(unittest.TestCase):
 
     def _assert_split(self, args, expected_split):
         self.assertEqual(MultiCommandTool._split_command_name_from_args(args), expected_split)
 
     def test_split_args(self):
         # MultiCommandToolTest._split_command_name_from_args returns: (command, args)
         full_args = ["--global-option", "command", "--option", "arg"]
         full_args_expected = ("command", ["--global-option", "--option", "arg"])
         self._assert_split(full_args, full_args_expected)
 
         full_args = []
         full_args_expected = (None, [])
         self._assert_split(full_args, full_args_expected)
 
         full_args = ["command", "arg"]
         full_args_expected = ("command", ["arg"])
         self._assert_split(full_args, full_args_expected)
 
     def test_command_by_name(self):
-        # This also tests Command auto-discovery.
-        tool = TrivialTool()
+        tool = TrivialTool(commands=[TrivialCommand(), UncommonCommand()])
         self.assertEqual(tool.command_by_name("trivial").name, "trivial")
         self.assertIsNone(tool.command_by_name("bar"))
 
     def _assert_tool_main_outputs(self, tool, main_args, expected_stdout, expected_stderr="", expected_exit_code=0):
         exit_code = OutputCapture().assert_outputs(
             self, tool.main, [main_args], expected_stdout=expected_stdout, expected_stderr=expected_stderr)
         self.assertEqual(exit_code, expected_exit_code)
 
     def test_global_help(self):
         tool = TrivialTool(commands=[TrivialCommand(), UncommonCommand()])
@@ skipping 23 matching lines @@
 
 See 'trivial-tool help --all-commands' to list all commands.
 See 'trivial-tool help COMMAND' for more information on a specific command.
 
 """
         self._assert_tool_main_outputs(tool, ["tool", "help", "--all-commands"], expected_all_commands_help)
         # Test that arguments can be passed before commands as well
         self._assert_tool_main_outputs(tool, ["tool", "--all-commands", "help"], expected_all_commands_help)
 
     def test_command_help(self):
-        command_with_options = TrivialCommand(options=[make_option("--my_option")], )
+        command_with_options = TrivialCommand(options=[make_option("--my_option")])
         tool = TrivialTool(commands=[command_with_options])
         expected_subcommand_help = """trivial [options]   help text
 
 trivial command long help text
 
 Options:
   --my_option=MY_OPTION
 
 """
         self._assert_tool_main_outputs(tool, ["tool", "help", "trivial"], expected_subcommand_help)
+
+    def test_constructor_calls_bind_to_tool(self):
+        tool = TrivialTool(commands=[TrivialCommand(), UncommonCommand()])
+        self.assertEqual(tool.commands[0]._tool, tool)
+        self.assertEqual(tool.commands[1]._tool, tool)