valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correctly check for GCE and EC2 deletion

Browse Source
This commit is contained in:
Tyler Johnson 2019-08-19 21:27:49 -06:00
parent 52c178c530
commit 5ceb47ee6f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/integration/cloud/helpers/cloud_test_base.py
View File

@ -102,7 +102,7 @@ class CloudTest(ShellCase):
log.debug('Deleting instance "{}"'.format(self.instance_name)) log.debug('Deleting instance "{}"'.format(self.instance_name))
delete = self.run_cloud('-d {0} --assume-yes'.format(self.instance_name), timeout=TIMEOUT) delete = self.run_cloud('-d {0} --assume-yes'.format(self.instance_name), timeout=TIMEOUT)
# example response: ['gce-config:', '----------', ' gce:', '----------', 'cloud-test-dq4e6c:', 'True', ''] # example response: ['gce-config:', '----------', ' gce:', '----------', 'cloud-test-dq4e6c:', 'True', '']
delete_str = yaml.safe_dump(delete) delete_str = yaml.safe_dump(delete).strip()
log.debug('Deletion status: |\n{}'.format(delete_str)) log.debug('Deletion status: |\n{}'.format(delete_str))
if any([x in delete_str for x in ( if any([x in delete_str for x in (
@ -114,15 +114,15 @@ class CloudTest(ShellCase):
elif any([x in delete_str for x in ( elif any([x in delete_str for x in (
'shutting-down', 'shutting-down',
'.delete', '.delete',
self.instance_name + '-DEL'
)]): )]):
sleep(shutdown_delay)
destroyed = True destroyed = True
log.debug('Instance "{}" is cleaning up'.format(self.instance_name)) log.debug('Instance "{}" is cleaning up'.format(self.instance_name))
else: else:
# It's not clear from the delete string that deletion was successful, ask salt-cloud after a delay
sleep(shutdown_delay) sleep(shutdown_delay)
# It's not clear from the delete string that deletion was successful, ask salt-cloud
query = self.query_instances() query = self.query_instances()
destroyed = self.instance_name in query destroyed = self.instance_name not in query
delete_str += ' :: ' * bool(delete_str) + ', '.join(query) delete_str += ' :: ' * bool(delete_str) + ', '.join(query)
return destroyed, delete_str return destroyed, delete_str