Join encoding (#223)

* Pass through encoding parameter on calling join
* Added test for passing encoding parameter to join
* Updated changelog

Co-authored-by: Tysher <jose.horta@gmail.com>

Author: pkittenis

Changelog.rst

@@ -29,6 +29,7 @@ Fixes
 -----
 
 * Removed now unnecessary locking around SSHClient initialisation so it can be parallelised - #219.
+* ``ParallelSSHClient.join`` with encoding would not pass on encoding when reading from output buffers - #214.
 
 
 1.13.0

pssh/clients/base/parallel.py

@@ -257,7 +257,7 @@ def join(self, output, consume_output=False, timeout=None,
         if not isinstance(output, list):
             raise ValueError("Unexpected output object type")
         cmds = [self.pool.spawn(self._join, host_out, timeout=timeout,
-                                consume_output=consume_output)
+                                consume_output=consume_output, encoding=encoding)
                 for host_i, host_out in enumerate(output)]
         # Errors raised by self._join should be propagated.
         finished_cmds = joinall(cmds, raise_error=True, timeout=timeout)

tests/native/test_parallel_client.py

@@ -1080,6 +1080,14 @@ def test_ssh_client_utf_encoding(self):
         _stdout = list(output[0].stdout)
         self.assertEqual([_utf16], _stdout)
 
+    def test_ssh_client_utf_encoding_join(self):
+        _utf16 = u'é'.encode('utf-8').decode('utf-16')
+        cmd = u"echo 'é'"
+        output = self.client.run_command(cmd, encoding='utf-16')
+        self.client.join(output, encoding='utf-16')
+        stdout = list(output[0].stdout)
+        self.assertEqual([_utf16], stdout)
+
     def test_pty(self):
         cmd = "echo 'asdf' >&2"
         expected_stderr = ['asdf']