This is an automated email from the ASF dual-hosted git repository. tomaz pushed a commit to branch 2.8.x in repository https://gitbox.apache.org/repos/asf/libcloud.git
commit 31a26ace57c427510ae932718f3435a99f912772 Author: Tomaz Muraus <[email protected]> AuthorDate: Sun Jun 7 14:17:31 2020 +0200 Fix test failure under Python 3. --- libcloud/test/compute/test_ssh_client.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/libcloud/test/compute/test_ssh_client.py b/libcloud/test/compute/test_ssh_client.py index bc1de3a..65cf556 100644 --- a/libcloud/test/compute/test_ssh_client.py +++ b/libcloud/test/compute/test_ssh_client.py @@ -28,6 +28,7 @@ from libcloud.compute.ssh import ParamikoSSHClient from libcloud.compute.ssh import ShellOutSSHClient from libcloud.compute.ssh import have_paramiko +from libcloud.utils.py3 import PY3 from libcloud.utils.py3 import StringIO from libcloud.utils.py3 import u from libcloud.utils.py3 import assertRaisesRegex @@ -527,8 +528,12 @@ class ParamikoSSHClientTests(LibcloudTestCase): chan.recv.side_effect = ['\xF0', '\x90', '\x8D', '\x88'] stdout = client._consume_stdout(chan).getvalue() - self.assertEqual('\xf0\x90\x8d\x88', stdout.encode('utf-8')) - self.assertTrue(len(stdout) in [1, 2]) + if PY3: + self.assertEqual('ð\x90\x8d\x88', stdout) + self.assertEqual(len(stdout), 4) + else: + self.assertEqual('\xf0\x90\x8d\x88', stdout.encode('utf-8')) + self.assertTrue(len(stdout) in [1, 2]) def test_consume_stderr_chunk_contains_part_of_multi_byte_utf8_character(self): conn_params = {'hostname': 'dummy.host.org', @@ -541,8 +546,13 @@ class ParamikoSSHClientTests(LibcloudTestCase): chan.recv_stderr.side_effect = ['\xF0', '\x90', '\x8D', '\x88'] stderr = client._consume_stderr(chan).getvalue() - self.assertEqual('\xf0\x90\x8d\x88', stderr.encode('utf-8')) - self.assertTrue(len(stderr) in [1, 2]) + + if PY3: + self.assertEqual('ð\x90\x8d\x88', stderr) + self.assertEqual(len(stderr), 4) + else: + self.assertEqual('\xf0\x90\x8d\x88', stderr.encode('utf-8')) + self.assertTrue(len(stderr) in [1, 2]) def test_consume_stdout_chunk_contains_non_utf8_character(self): conn_params = {'hostname': 'dummy.host.org',
