Updated tests to correctly test with multiple directories when copying files. Resolves #64. Bumped version

Author: Dan

pssh/pssh_client.py

@@ -88,6 +88,16 @@ def __init__(self, hosts,
         :param proxy_port: (Optional) SSH port to use to login to proxy host if \
         set. Defaults to 22.
         :type proxy_port: int
+        :param proxy_user: (Optional) User to login to ``proxy_host`` as. Defaults to \
+        logged in user.
+        :type proxy_user: str
+        :param proxy_password: (Optional) Password to login to ``proxy_host`` with. \
+        Defaults to no password
+        :type proxy_password: str
+        :param proxy_pkey: (Optional) Private key to be used for authentication \
+        with ``proxy_host``. Defaults to available keys from SSHAgent and user's \
+        home directory keys
+        :type proxy_pkey: :mod:`paramiko.PKey`
         :param agent: (Optional) SSH agent object to programmatically supply an \
         agent to override system SSH agent with
         :type agent: :mod:`pssh.agent.SSHAgent`

pssh/ssh_client.py

@@ -348,10 +348,9 @@ def copy_file(self, local_file, remote_file, recurse=False):
         :param recurse: Whether or not to descend into directories recursively.
         :type recurse: bool
         
-        :raises: :mod:`ValueError` when a directory is supplied to local_file \
-        and recurse is not set
+        :raises: :mod:`ValueError` when a directory is supplied to ``local_file`` \
+        and ``recurse`` is not set
         """
-        # import ipdb; ipdb.set_trace()
         if os.path.isdir(local_file) and recurse:
             return self._copy_dir(local_file, remote_file)
         elif os.path.isdir(local_file) and not recurse:

setup.py

@@ -21,7 +21,7 @@
     convert_2_to_3['use_2to3'] = True
 
 setup(name='parallel-ssh',
-      version='0.92.1',
+      version='0.92.2',
       description='Asynchronous parallel SSH library',
       author='Panos Kittenis',
       author_email='22e889d8@opayq.com',

tests/test_pssh_client.py

@@ -62,7 +62,7 @@ def tearDown(self):
         del self.server
         del self.listen_socket
         del self.client
-            
+    
     def test_pssh_client_exec_command(self):
         cmd = self.client.exec_command(self.fake_cmd)[0]
         output = self.client.get_stdout(cmd)
@@ -360,7 +360,7 @@ def test_pssh_copy_file(self):
         del client
 
     def test_pssh_client_directory(self):
-        """Tests copying directories with SSH client. Copy all the files from
+        """Tests copying multiple directories with SSH client. Copy all the files from
         local directory to server, then make sure they are all present."""
         test_file_data = 'test'
         local_test_path = 'directory_test'
@@ -373,8 +373,10 @@ def test_pssh_client_directory(self):
         os.mkdir(local_test_path)
         remote_file_paths = []
         for i in range(0, 10):
-            local_file_path = os.path.join(local_test_path, 'foo' + str(i))
-            remote_file_path = os.path.join(remote_test_path, 'foo' + str(i))
+            local_file_path_dir = os.path.join(local_test_path, 'dir_foo' + str(i))
+            os.mkdir(local_file_path_dir)
+            local_file_path = os.path.join(local_file_path_dir, 'foo' + str(i))
+            remote_file_path = os.path.join(remote_test_path, 'dir_foo' + str(i), 'foo' + str(i))
             remote_file_paths.append(remote_file_path)
             test_file = open(local_file_path, 'w')
             test_file.write(test_file_data)