Updated ssh exception to not use deprecated message from base exception. Updated ssh exception test to use user/password login to avoid authentication error.

Author: Dan

pssh/ssh_client.py

@@ -177,8 +177,9 @@ def _connect(self, client, host, port, sock=None, retries=1):
         # SSHException is more general so should be below other types
         # of SSH failure
         except paramiko.SSHException, ex:
-            logger.error("General SSH error - %s", ex)
-            raise SSHException(ex.message, host, port)
+            msg = "General SSH error - %s" % (ex,)
+            logger.error(msg)
+            raise SSHException(msg, host, port)
 
     def exec_command(self, command, sudo=False, user=None, **kwargs):
         """Wrapper to :mod:`paramiko.SSHClient.exec_command`

tests/test_pssh_client.py

@@ -504,7 +504,8 @@ def test_ssh_exception(self):
         server = start_server(_socket, ssh_exception=True)
         hosts = [host]
         client = ParallelSSHClient(hosts, port=port,
-                                   pkey=self.user_key)
+                                   user='fakey', password='fakey',
+                                   pkey=paramiko.RSAKey.generate(1024))
         output = client.run_command(self.fake_cmd, stop_on_errors=False)
         client.pool.join()
         self.assertTrue('exception' in output[host],