Added proxy with remote server failure test

ParallelSSH · Feb 1, 2017 · 495b777 · 495b777
1 parent 7d3dd9f
commit 495b777
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/pssh/ssh_client.py b/pssh/ssh_client.py
@@ -243,8 +243,8 @@ def exec_command(self, command, sudo=False, user=None,
             channel.settimeout(self.channel_timeout)
         if environment:
             channel.update_environment(environment)
-        stdout, stderr, stdin = channel.makefile('rb'), channel.makefile_stderr('rb'), \
-          channel.makefile('wb')
+        stdout, stderr, stdin = channel.makefile('rb'), \
+          channel.makefile_stderr('rb'), channel.makefile('wb')
         for _char in ['\\', '"', '$', '`']:
             command = command.replace(_char, r'\%s' % (_char,))
         shell = '$SHELL -c' if not shell else shell
@@ -383,7 +383,8 @@ def copy_file(self, local_file, remote_file, recurse=False,
         try:
             sftp.put(local_file, remote_file)
         except Exception as error:
-            logger.error("Error occured copying file %s to remote destination %s:%s - %s",
+            logger.error("Error occured copying file %s to remote destination "
+                         "%s:%s - %s",
                          local_file, self.host, remote_file, error)
             raise error
         logger.info("Copied local file %s to remote destination %s:%s",

diff --git a/tests/test_pssh_client.py b/tests/test_pssh_client.py
@@ -577,6 +577,23 @@ def test_ssh_proxy(self):
             server.kill()
             proxy_server.kill()
 
+    def test_ssh_proxy_target_host_failure(self):
+        del self.client
+        self.client = None
+        self.server.kill()
+        proxy_host = '127.0.0.2'
+        proxy_server, proxy_server_port = start_server_from_ip(proxy_host)
+        client = ParallelSSHClient([self.host], port=self.listen_port,
+                                   pkey=self.user_key,
+                                   proxy_host=proxy_host,
+                                   proxy_port=proxy_server_port,
+                                   )
+        try:
+            self.assertRaises(ConnectionErrorException, client.run_command, self.fake_cmd)
+        finally:
+            del client
+            proxy_server.kill()
+
     def test_ssh_proxy_auth(self):
         """Test connecting to remote destination via SSH proxy
         client -> proxy -> destination