Allows all arguments/options with deprecated 'sl' command

sudorandom · sudorandom · commit 528452ea3a0f · 2015-03-27T15:31:14.000-05:00
diff --git a/SoftLayer/CLI/deprecated.py b/SoftLayer/CLI/deprecated.py
@@ -4,14 +4,12 @@
     Handles usage of the deprecated command name, 'sl'.
     :license: MIT, see LICENSE for more details.
 """
+from __future__ import print_function
 import sys
 
-import click
 
-
-@click.command()
 def main():
     """Main function for the deprecated 'sl' command."""
-    click.echo("ERROR: Use the 'slcli' command instead.", err=True)
-    click.echo("> slcli %s" % ' '.join(sys.argv[1:]), err=True)
+    print("ERROR: Use the 'slcli' command instead.", file=sys.stderr)
+    print("> slcli %s" % ' '.join(sys.argv[1:]), file=sys.stderr)
     exit(-1)
diff --git a/SoftLayer/tests/CLI/deprecated_tests.py b/SoftLayer/tests/CLI/deprecated_tests.py
@@ -4,17 +4,29 @@
 
     :license: MIT, see LICENSE for more details.
 """
-import click
+import mock
 
 from SoftLayer.CLI import deprecated
 from SoftLayer import testing
+from SoftLayer import utils
 
 
 class EnvironmentTests(testing.TestCase):
 
     def test_main(self):
-        runner = click.testing.CliRunner()
-        result = runner.invoke(deprecated.main)
+        with mock.patch('sys.stderr', new=utils.StringIO()) as fake_out:
+            ex = self.assertRaises(SystemExit, deprecated.main)
+            self.assertEqual(ex.code, -1)
 
-        self.assertEqual(result.exit_code, -1)
-        self.assertIn("ERROR: Use the 'slcli' command instead.", result.output)
+            self.assertIn("ERROR: Use the 'slcli' command instead.",
+                          fake_out.getvalue())
+
+    def test_with_args(self):
+
+        with mock.patch('sys.stderr', new=utils.StringIO()) as fake_out:
+            with mock.patch('sys.argv', new=['sl', 'module', 'subcommand']):
+                ex = self.assertRaises(SystemExit, deprecated.main)
+                self.assertEqual(ex.code, -1)
+
+                self.assertIn("ERROR: Use the 'slcli' command instead.",
+                              fake_out.getvalue())
