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

moved installer finder to SetUp method

Browse source
This commit is contained in:
Tyler Johnson 2019-08-13 09:55:48 -06:00
parent 933964a286
commit a86ae341ba
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
tests/integration/cloud/clouds/test_ec2.py
View file

@ -27,27 +27,6 @@ HAS_WINRM = salt.utils.cloud.HAS_WINRM and salt.utils.cloud.HAS_SMB
TIMEOUT = 1200
def _fetch_installer():
'''
Make sure the testing environment has a Windows installer executable.
'''
# Determine the downloaded installer name by searching the files
# directory for the first file that looks like an installer.
for path, dirs, files in os.walk(FILES):
for file in files:
if file.startswith(win_installer.PREFIX):
return file
# Download the latest Windows installer executable
name = win_installer.latest_installer_name()
path = os.path.join(FILES, name)
with salt.utils.files.fopen(path, 'wb') as fp:
win_installer.download_and_verify(fp, name)
return name
INSTALLER = _fetch_installer()
class EC2Test(CloudTest):
'''
Integration tests for the EC2 cloud provider in Salt-Cloud
@ -55,6 +34,24 @@ class EC2Test(CloudTest):
PROVIDER = 'ec2'
REQUIRED_PROVIDER_CONFIG_ITEMS = ('id', 'key', 'keyname', 'private_key', 'location')
@property
def installer(self):
'''
Make sure the testing environment has a Windows installer executable.
'''
# Determine the downloaded installer name by searching the files
# directory for the first file that looks like an installer.
for path, dirs, files in os.walk(FILES):
for file in files:
if file.startswith(win_installer.PREFIX):
return file
# Download the latest Windows installer executable
name = win_installer.latest_installer_name()
path = os.path.join(FILES, name)
with salt.utils.files.fopen(path, 'wb') as fp:
win_installer.download_and_verify(fp, name)
return name
@expensiveTest
def setUp(self):
'''