Fixes tests

sudorandom · sudorandom · commit 230e5a81a4f8 · 2015-08-04T23:25:13.000-05:00
diff --git a/SoftLayer/shell/core.py b/SoftLayer/shell/core.py
@@ -35,13 +35,13 @@
 
 
 class ShellExit(Exception):
+    """Exception raised to quit the shell."""
     pass
 
 
 @click.command()
 @environment.pass_env
-@click.pass_context
-def cli(ctx, env):
+def cli(env):
     """Enters a shell for slcli."""
     env.load_modules_from_python(ALL_ROUTES)
     env.aliases.update(ALL_ALIASES)
diff --git a/SoftLayer/tests/CLI/core_tests.py b/SoftLayer/tests/CLI/core_tests.py
@@ -19,7 +19,8 @@
 class CoreTests(testing.TestCase):
 
     def test_load_all(self):
-        for path, cmd in recursive_subcommand_loader(core.cli, path='root'):
+        for path, cmd in recursive_subcommand_loader(core.cli,
+                                                     current_path='root'):
             try:
                 cmd.main(args=['--help'])
             except SystemExit as ex:
@@ -98,7 +99,7 @@ def test_auth_error(self, stdoutmock, climock):
         self.assertIn("use 'slcli config setup'", stdoutmock.getvalue())
 
 
-def recursive_subcommand_loader(root, path=''):
+def recursive_subcommand_loader(root, current_path=''):
     """Recursively load and list every command."""
 
     if getattr(root, 'list_commands', None) is None:
@@ -107,9 +108,10 @@ def recursive_subcommand_loader(root, path=''):
     ctx = click.Context(root)
 
     for command in root.list_commands(ctx):
-        new_path = '%s:%s' % (path, command)
+        new_path = '%s:%s' % (current_path, command)
         logging.info("loading %s", new_path)
         new_root = root.get_command(ctx, command)
-        for path, cmd in recursive_subcommand_loader(new_root, path=new_path):
+        for path, cmd in recursive_subcommand_loader(new_root,
+                                                     current_path=new_path):
             yield path, cmd
-        yield path, new_root
+        yield current_path, new_root
diff --git a/tools/requirements.txt b/tools/requirements.txt
@@ -2,3 +2,4 @@ requests
 click
 prettytable >= 0.7.0
 six >= 1.7.0
+prompt_toolkit
