Fix cross Python version compatibility issues.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/668c23e5 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/668c23e5 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/668c23e5 Branch: refs/heads/trunk Commit: 668c23e597711ddaa77c42aa2cbb43f1863cd54e Parents: 1f23b0f Author: Tomaz Muraus <[email protected]> Authored: Tue Jan 26 22:29:51 2016 +0100 Committer: Tomaz Muraus <[email protected]> Committed: Tue Jan 26 22:29:51 2016 +0100 ---------------------------------------------------------------------- libcloud/test/compute/test_ssh_client.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/668c23e5/libcloud/test/compute/test_ssh_client.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ssh_client.py b/libcloud/test/compute/test_ssh_client.py index 39a2aa3..0fe15a9 100644 --- a/libcloud/test/compute/test_ssh_client.py +++ b/libcloud/test/compute/test_ssh_client.py @@ -29,6 +29,7 @@ from libcloud.compute.ssh import ShellOutSSHClient from libcloud.compute.ssh import have_paramiko from libcloud.utils.py3 import StringIO +from libcloud.utils.py3 import u from mock import patch, Mock, MagicMock @@ -268,7 +269,7 @@ class ParamikoSSHClientTests(LibcloudTestCase): chan.recv.side_effect = ['123', '456'] stdout = client._consume_stdout(chan).getvalue() - self.assertEqual(u'123456', stdout) + self.assertEqual(u('123456'), stdout) self.assertEqual(len(stdout), 6) conn_params = {'hostname': 'dummy.host.org', @@ -281,7 +282,7 @@ class ParamikoSSHClientTests(LibcloudTestCase): chan.recv.side_effect = ['987', '6543210'] stdout = client._consume_stdout(chan).getvalue() - self.assertEqual(u'9876543210', stdout) + self.assertEqual(u('9876543210'), stdout) self.assertEqual(len(stdout), 10) def test_consume_stderr(self): @@ -295,7 +296,7 @@ class ParamikoSSHClientTests(LibcloudTestCase): chan.recv_stderr.side_effect = ['123', '456'] stderr = client._consume_stderr(chan).getvalue() - self.assertEqual(u'123456', stderr) + self.assertEqual(u('123456'), stderr) self.assertEqual(len(stderr), 6) conn_params = {'hostname': 'dummy.host.org', @@ -308,7 +309,7 @@ class ParamikoSSHClientTests(LibcloudTestCase): chan.recv_stderr.side_effect = ['987', '6543210'] stderr = client._consume_stderr(chan).getvalue() - self.assertEqual(u'9876543210', stderr) + self.assertEqual(u('9876543210'), stderr) self.assertEqual(len(stderr), 10) def test_consume_stdout_chunk_contains_part_of_multi_byte_utf8_character(self): @@ -322,7 +323,7 @@ class ParamikoSSHClientTests(LibcloudTestCase): chan.recv.side_effect = ['\xF0', '\x90', '\x8D', '\x88'] stdout = client._consume_stdout(chan).getvalue() - self.assertEqual(u'\U00010348', stdout) + self.assertEqual(u('\U00010348'), stdout) self.assertEqual(len(stdout), 1) def test_consume_stderr_chunk_contains_part_of_multi_byte_utf8_character(self): @@ -336,7 +337,7 @@ class ParamikoSSHClientTests(LibcloudTestCase): chan.recv_stderr.side_effect = ['\xF0', '\x90', '\x8D', '\x88'] stderr = client._consume_stderr(chan).getvalue() - self.assertEqual(u'\U00010348', stderr) + self.assertEqual(u('\U00010348'), stderr) self.assertEqual(len(stderr), 1)
