Fix shell CLI tests.

Author: camporter

SoftLayer/testing/__init__.py

@@ -157,7 +157,7 @@ def set_mock(self, service, method):
         """Set and return mock on the current client."""
         return self.mocks.set_mock(service, method)
 
-    def run_command(self, args=None, env=None, fixtures=True, fmt='json'):
+    def run_command(self, args=None, env=None, fixtures=True, fmt='json', input=None):
         """A helper that runs a SoftLayer CLI command.
 
         This returns a click.testing.Result object.
@@ -169,7 +169,7 @@ def run_command(self, args=None, env=None, fixtures=True, fmt='json'):
         args.insert(0, '--format=%s' % fmt)
 
         runner = testing.CliRunner()
-        return runner.invoke(core.cli, args=args, obj=env or self.env)
+        return runner.invoke(core.cli, args=args, input=input, obj=env or self.env)
 
 
 def call_has_props(call, props):

tests/CLI/modules/shell_tests.py

@@ -6,22 +6,24 @@
 """
 from SoftLayer import testing
 
-import mock
+import tempfile
 
 
 class ShellTests(testing.TestCase):
-    @mock.patch('prompt_toolkit.shortcuts.prompt')
-    def test_shell_quit(self, prompt):
-        prompt.return_value = "quit"
-        result = self.run_command(['shell'])
-        self.assertEqual(result.exit_code, 0)
 
-    @mock.patch('prompt_toolkit.shortcuts.prompt')
-    @mock.patch('shlex.split')
-    def test_shell_help(self, prompt, split):
-        split.side_effect = [(['help']), (['vs', 'list']), (False), (['quit'])]
-        prompt.return_value = "none"
-        result = self.run_command(['shell'])
-        if split.call_count is not 5:
-            raise Exception("Split not called correctly. Count: " + str(split.call_count))
-        self.assertEqual(result.exit_code, 1)
+    def test_shell_quit(self):
+        # Use a file as stdin
+        with tempfile.NamedTemporaryFile() as stdin:
+            stdin.write(b'exit\n')
+            stdin.seek(0)
+            result = self.run_command(['shell'], input=stdin)
+            self.assertEqual(result.exit_code, 0)
+
+    def test_shell_help(self):
+        # Use a file as stdin
+        with tempfile.NamedTemporaryFile() as stdin:
+            stdin.write(b'help\nexit\n')
+            stdin.seek(0)
+            result = self.run_command(['shell'], input=stdin)
+            self.assertIn('Welcome to the SoftLayer shell.', result.output)
+            self.assertEqual(result.exit_code, 0)