[libcloud] branch trunk updated: New version of paramiko support openssh key format so make so this test doesn't run under new version of paramiko.

[to...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tomaz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/libcloud.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 89dcd5e  New version of paramiko support openssh key format so make so this test doesn't run under new version of paramiko.
89dcd5e is described below

commit 89dcd5edccfeb7d2ddeb4bb7614eee9ec5d6444f
Author: Tomaz Muraus <to...@tomaz.me>
AuthorDate: Thu Dec 5 20:51:26 2019 +0100

    New version of paramiko support openssh key format so make so this test
    doesn't run under new version of paramiko.
---
 docs/compute/deployment.rst              | 5 +++++
 libcloud/test/compute/test_ssh_client.py | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/docs/compute/deployment.rst b/docs/compute/deployment.rst
index 31c1935..0270d26 100644
--- a/docs/compute/deployment.rst
+++ b/docs/compute/deployment.rst
@@ -24,6 +24,11 @@ management software.
 Supported private SSH key types
 -------------------------------
 
+.. note::
+
+  paramiko v2.7.0 introduced support for OpenSSH 6.5 style private key files
+  so this section is only relevant for users using older versions of paramiko.
+
 `paramiko`_ Python library we use for deployment only supports RSA, DSS and
 ECDSA private keys in PEM format.
 
diff --git a/libcloud/test/compute/test_ssh_client.py b/libcloud/test/compute/test_ssh_client.py
index eae7330..2704d1c 100644
--- a/libcloud/test/compute/test_ssh_client.py
+++ b/libcloud/test/compute/test_ssh_client.py
@@ -36,8 +36,10 @@ from mock import patch, Mock, MagicMock
 
 if not have_paramiko:
     ParamikoSSHClient = None  # NOQA
+    paramiko_version = '0.0.0'
 else:
     import paramiko
+    paramiko_version = paramiko.__version__
 
 
 @unittest.skipIf(not have_paramiko, 'Skipping because paramiko is not available')
@@ -140,6 +142,8 @@ class ParamikoSSHClientTests(LibcloudTestCase):
                           expected_msg, mock.connect)
 
     @patch('paramiko.SSHClient', Mock)
+    @unittest.skipIf(paramiko_version >= '2.7.0',
+                     'New versions of paramiko support OPENSSH key format')
     def test_key_file_non_pem_format_error(self):
         path = os.path.join(os.path.dirname(__file__),
                             'fixtures', 'misc',