Added stdin channel to output

Author: Dan

embedded_server/embedded_server.py

@@ -58,7 +58,8 @@
 logger = logging.getLogger("embedded_server")
 paramiko_logger = logging.getLogger('paramiko.transport')
 
-host_key = paramiko.RSAKey(filename = os.path.sep.join([os.path.dirname(__file__), 'rsa.key']))
+host_key = paramiko.RSAKey(filename=os.path.sep.join([
+    os.path.dirname(__file__), 'rsa.key']))
 
 class Server(paramiko.ServerInterface):
     def __init__(self, transport, fail_auth=False,
@@ -126,6 +127,8 @@ def check_channel_exec_request(self, channel, cmd,
         return True
 
     def _read_response(self, channel, process):
+        gevent.sleep(0)
+        logger.debug("Waiting for output")
         for line in process.stdout:
             channel.send(line)
         process.communicate()

pssh/pssh_client.py

@@ -429,6 +429,19 @@ def run_command(self, *args, **kwargs):
                        'exception' : ConnectionErrorException(
                            "Error connecting to host '%s:%s' - %s - retry %s/%s",
                            host, port, 'Connection refused', 3, 3)}}
+
+        **Using stdin**
+
+        ::
+
+          output = client.run_command('read')
+          stdin = output['localhost']['stdin']
+          stdin.write("writing to stdin\n")
+          stdin.flush()
+          for line in output['localhost']['stdout']:
+            print line
+          
+          writing to stdin
         
         """
         stop_on_errors = kwargs.pop('stop_on_errors', True)

tests/test_ssh_client.py

@@ -205,7 +205,7 @@ def test_ssh_agent_authentication(self):
         agent.add_key(USER_KEY)
         client = SSHClient(self.host, port=self.listen_port,
                            agent=agent)
-        channel, host, stdout, stderr = client.exec_command(self.fake_cmd)
+        channel, host, stdout, stderr, stdin = client.exec_command(self.fake_cmd)
         output = list(stdout)
         stderr = list(stderr)
         expected = [self.fake_resp]
@@ -254,7 +254,7 @@ def test_ssh_client_utf_encoding(self):
                            pkey=self.user_key)
         expected = [u'é']
         cmd = u"echo 'é'"
-        channel, host, stdout, stderr = client.exec_command(cmd)
+        channel, host, stdout, stderr, stdin = client.exec_command(cmd)
         output = list(stdout)
         self.assertEqual(expected, output,
                          msg="Got unexpected unicode output %s - expected %s" % (
@@ -266,7 +266,7 @@ def test_ssh_client_pty(self):
         and that shell commands fail accordingly"""
         client = SSHClient(self.host, port=self.listen_port,
                            pkey=self.user_key)
-        channel, host, stdout, stderr = client.exec_command(self.fake_cmd, use_shell=False)
+        channel, host, stdout, stderr, stdin = client.exec_command(self.fake_cmd, use_shell=False)
         output = list(stdout)
         stderr = list(stderr)
         expected = []
@@ -276,7 +276,7 @@ def test_ssh_client_pty(self):
         self.assertTrue(exit_code==127,
                         msg="Expected cmd not found error code 127, got %s instead" % (
                             exit_code,))
-        channel, host, stdout, stderr = client.exec_command('id', use_shell=False)
+        channel, host, stdout, stderr, stdin = client.exec_command('id', use_shell=False)
         output = list(stdout)
         exit_code = channel.recv_exit_status()
         self.assertTrue(output,