Added sftp exception tests

Author: Dan

tests/test_pssh_client.py

@@ -29,7 +29,6 @@
 import random
 import logging
 import gevent
-import threading
 import paramiko
 import os
 import warnings
@@ -308,7 +307,7 @@ def test_pssh_client_long_running_command_exit_codes(self):
                         msg="Got non-zero exit code %s" % (
                             output[self.host]['exit_code'],))
         del client
-        
+    
     def test_pssh_client_retries(self):
         """Test connection error retries"""
         listen_socket = make_socket(self.host)
@@ -327,7 +326,19 @@ def test_pssh_client_retries(self):
                              % (num_tries, expected_num_tries,))
         else:
             raise Exception('No ConnectionErrorException')
-
+    
+    def test_sftp_exceptions(self):
+        self.server.kill()
+        # Make socket with no server listening on it on separate ip
+        host = '127.0.0.3'
+        _socket = make_socket(host)
+        port = _socket.getsockname()[1]
+        client = ParallelSSHClient([self.host], port=port, num_retries=1)
+        cmds = client.copy_file("test", "test")
+        client.pool.join()
+        for cmd in cmds:
+            self.assertRaises(ConnectionErrorException, cmd.get)
+    
     def test_pssh_copy_file(self):
         """Test parallel copy file"""
         test_file_data = 'test'
@@ -348,7 +359,7 @@ def test_pssh_copy_file(self):
         for filepath in [local_filename, remote_filename]:
             os.unlink(filepath)
         del client
-
+    
     def test_pssh_client_directory(self):
         """Tests copying directories with SSH client. Copy all the files from
         local directory to server, then make sure they are all present."""
@@ -378,7 +389,7 @@ def test_pssh_client_directory(self):
             self.assertTrue(os.path.isfile(path))
         shutil.rmtree(local_test_path)
         shutil.rmtree(remote_test_path)
-
+    
     def test_pssh_pool_size(self):
         """Test setting pool size to non default values"""
         hosts = ['host-%01d' % d for d in xrange(5)]

tests/test_ssh_client.py

@@ -110,6 +110,16 @@ def test_ssh_client_mkdir_single(self):
         shutil.rmtree(remote_dir)
         del client
 
+    def test_sftp_exceptions(self):
+        self.server.kill()
+        # Make socket with no server listening on it on separate ip
+        host = '127.0.0.3'
+        _socket = make_socket(host)
+        port = _socket.getsockname()[1]
+        self.assertRaises(ConnectionErrorException, SSHClient,
+                          host, port=port, num_retries=1)
+        del _socket
+    
     def test_ssh_client_sftp(self):
         """Test SFTP features of SSHClient. Copy local filename to server,
         check that data in both files is the same, make new directory on