Don't shadow input with the new parameter

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', input=None):
+    def run_command(self, args=None, env=None, fixtures=True, fmt='json', stdin=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', input=None
         args.insert(0, '--format=%s' % fmt)
 
         runner = testing.CliRunner()
-        return runner.invoke(core.cli, args=args, input=input, obj=env or self.env)
+        return runner.invoke(core.cli, args=args, input=stdin, obj=env or self.env)
 
 
 def call_has_props(call, props):

tests/CLI/modules/shell_tests.py

@@ -16,14 +16,14 @@ def test_shell_quit(self):
         with tempfile.NamedTemporaryFile() as stdin:
             stdin.write(b'exit\n')
             stdin.seek(0)
-            result = self.run_command(['shell'], input=stdin)
+            result = self.run_command(['shell'], stdin=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)
+            result = self.run_command(['shell'], stdin=stdin)
             self.assertIn('Welcome to the SoftLayer shell.', result.output)
             self.assertEqual(result.exit_code, 0)