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

Keep ec2 instance creation test the same - it works better for the ec2 output

Browse source
This commit is contained in:
rallytime 2015-08-25 11:01:02 -06:00
parent b5b58eb31f
commit 2b4bc1679d
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/integration/cloud/providers/ec2.py
View file

@ -92,22 +92,24 @@ class EC2Test(integration.ShellCase):
'''
Tests creating and deleting an instance on EC2 (classic)
'''
# check if instance with salt installed returned
# create the instance
instance = self.run_cloud('-p ec2-test {0}'.format(INSTANCE_NAME))
ret_str = '{0}:'.format(INSTANCE_NAME)
# check if instance returned with salt installed
try:
self.assertIn(
INSTANCE_NAME,
[i.strip() for i in self.run_cloud('-p ec2-test {0}'.format(INSTANCE_NAME))]
)
self.assertIn(ret_str, instance)
except AssertionError:
self.run_cloud('-d {0} --assume-yes'.format(INSTANCE_NAME))
raise
# delete the instance
delete = self.run_cloud('-d {0} --assume-yes'.format(INSTANCE_NAME))
ret_str = ' shutting-down'
# check if deletion was performed appropriately
try:
self.assertIn(
INSTANCE_NAME + ':',
[i.strip() for i in self.run_cloud('-d {0} --assume-yes'.format(INSTANCE_NAME))]
)
self.assertIn(ret_str, delete)
except AssertionError:
raise