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

Removing an un needed change and maybe fixing the lint error

Browse source
This commit is contained in:
Brett Benassi 2018-10-29 15:30:51 -06:00
parent e00c507670
commit 80982ada82
No known key found for this signature in database
GPG key ID: 7056CA43F36FDA8C
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/integration/cloud/providers/test_ec2.py
View file

@ -38,6 +38,8 @@ def __random_name(size=6):
# Create the cloud instance name to be used throughout the tests
INSTANCE_NAME = __random_name()
PROVIDER_NAME = 'ec2'
HAS_WINRM = salt.utils.cloud.HAS_WINRM and salt.utils.cloud.HAS_SMB
TIMEOUT = 1200
@ -113,11 +115,10 @@ class EC2Test(ShellCase):
key = config[profile_str][PROVIDER_NAME]['key']
key_name = config[profile_str][PROVIDER_NAME]['keyname']
sec_group = config[profile_str][PROVIDER_NAME]['securitygroupname'][0]
subnet_id = config[profile_str][PROVIDER_NAME]['subnet_id']
private_key = config[profile_str][PROVIDER_NAME]['private_key']
location = config[profile_str][PROVIDER_NAME]['location']
conf_items = [id_, key, key_name, sec_group, subnet_id, private_key, location]
conf_items = [id_, key, key_name, sec_group, private_key, location]
missing_conf_item = []
for item in conf_items:
@ -126,7 +127,7 @@ class EC2Test(ShellCase):
if missing_conf_item:
self.skipTest(
'An id, key, keyname, security group, subnet id, private key, and location must '
'An id, key, keyname, security group, private key, and location must '
'be provided to run these tests. One or more of these elements is '
'missing. Check tests/integration/files/conf/cloud.providers.d/{0}.conf'
.format(PROVIDER_NAME)