saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 17:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #52736 from dwoz/ec2test

Browse source 
Skip password decryption test when no libraries available
This commit is contained in:
Daniel Wozniak 2019-04-29 10:07:55 -07:00 • committed by GitHub
commit 6bfca941a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/cloud/clouds/ec2.py
View file

@ -4887,6 +4887,8 @@ def get_password_data(
ret[next(six.iterkeys(item))] = next(six.itervalues(item))
if not HAS_M2 and not HAS_PYCRYPTO:
if 'key' in kwargs or 'key_file' in kwargs:
log.warn("No crypto library is installed, can not decrypt password")
return ret
if 'key' not in kwargs:

1
tests/unit/cloud/clouds/test_ec2.py
View file

@ -66,6 +66,7 @@ class EC2TestCase(TestCase, LoaderModuleMockMixin):
self.assertRaises(
SaltCloudSystemExit, ec2._validate_key_path_and_mode, 'key_file')
@skipIf(not ec2.HAS_M2 and not ec2.HAS_PYCRYPTO, 'Needs crypto library')
@patch('salt.cloud.clouds.ec2._get_node')
@patch('salt.cloud.clouds.ec2.get_location')
@patch('salt.cloud.clouds.ec2.get_provider')